summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorEric Paris2009-12-18 03:24:22 +0100
committerEric Paris2010-07-28 15:58:50 +0200
commit74be0cc82835aecad332a29896b0f212ba893403 (patch)
treeeaae59c73ba52ff8cab8ee845e989d9877603f4c /kernel
parentfsnotify: lock annotation for event replacement (diff)
downloadkernel-qcow2-linux-74be0cc82835aecad332a29896b0f212ba893403.tar.gz
kernel-qcow2-linux-74be0cc82835aecad332a29896b0f212ba893403.tar.xz
kernel-qcow2-linux-74be0cc82835aecad332a29896b0f212ba893403.zip
fsnotify: remove group_num altogether
The original fsnotify interface has a group-num which was intended to be able to find a group after it was added. I no longer think this is a necessary thing to do and so we remove the group_num. Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/audit_tree.c3
-rw-r--r--kernel/audit_watch.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index e3d63b596ef0..59065e72a2eb 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -937,8 +937,7 @@ static int __init audit_tree_init(void)
{
int i;
- audit_tree_group = fsnotify_obtain_group(AUDIT_TREE_GROUP_NUM,
- 0, &audit_tree_ops);
+ audit_tree_group = fsnotify_obtain_group(0, &audit_tree_ops);
if (IS_ERR(audit_tree_group))
audit_panic("cannot initialize fsnotify group for rectree watches");
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index 85c43aa292e0..c500104d38c2 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -577,7 +577,7 @@ static const struct fsnotify_ops audit_watch_fsnotify_ops = {
static int __init audit_watch_init(void)
{
- audit_watch_group = fsnotify_obtain_group(AUDIT_WATCH_GROUP_NUM, AUDIT_FS_WATCH,
+ audit_watch_group = fsnotify_obtain_group(AUDIT_FS_WATCH,
&audit_watch_fsnotify_ops);
if (IS_ERR(audit_watch_group)) {
audit_watch_group = NULL;