diff options
author | Eric Paris <eparis@redhat.com> | 2009-12-17 21:24:22 -0500 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2010-07-28 09:58:50 -0400 |
commit | 74be0cc82835aecad332a29896b0f212ba893403 (patch) | |
tree | eaae59c73ba52ff8cab8ee845e989d9877603f4c /include/linux | |
parent | cac69dad32899c6f4c66bb4f9baf69b0d3c7d3d1 (diff) |
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 'include/linux')
-rw-r--r-- | include/linux/fsnotify_backend.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h index 427f6ffab127..57e503d017c8 100644 --- a/include/linux/fsnotify_backend.h +++ b/include/linux/fsnotify_backend.h | |||
@@ -60,12 +60,6 @@ | |||
60 | 60 | ||
61 | #define FS_MOVE (FS_MOVED_FROM | FS_MOVED_TO) | 61 | #define FS_MOVE (FS_MOVED_FROM | FS_MOVED_TO) |
62 | 62 | ||
63 | /* listeners that hard code group numbers near the top */ | ||
64 | #define DNOTIFY_GROUP_NUM UINT_MAX | ||
65 | #define AUDIT_WATCH_GROUP_NUM (DNOTIFY_GROUP_NUM-1) | ||
66 | #define AUDIT_TREE_GROUP_NUM (AUDIT_WATCH_GROUP_NUM-1) | ||
67 | #define INOTIFY_GROUP_NUM (AUDIT_TREE_GROUP_NUM-1) | ||
68 | |||
69 | struct fsnotify_group; | 63 | struct fsnotify_group; |
70 | struct fsnotify_event; | 64 | struct fsnotify_event; |
71 | struct fsnotify_mark_entry; | 65 | struct fsnotify_mark_entry; |
@@ -124,7 +118,6 @@ struct fsnotify_group { | |||
124 | * closed. | 118 | * closed. |
125 | */ | 119 | */ |
126 | atomic_t refcnt; /* things with interest in this group */ | 120 | atomic_t refcnt; /* things with interest in this group */ |
127 | unsigned int group_num; /* simply prevents accidental group collision */ | ||
128 | 121 | ||
129 | const struct fsnotify_ops *ops; /* how this group handles things */ | 122 | const struct fsnotify_ops *ops; /* how this group handles things */ |
130 | 123 | ||
@@ -312,8 +305,7 @@ static inline void __fsnotify_d_instantiate(struct dentry *dentry, struct inode | |||
312 | /* must call when a group changes its ->mask */ | 305 | /* must call when a group changes its ->mask */ |
313 | extern void fsnotify_recalc_global_mask(void); | 306 | extern void fsnotify_recalc_global_mask(void); |
314 | /* get a reference to an existing or create a new group */ | 307 | /* get a reference to an existing or create a new group */ |
315 | extern struct fsnotify_group *fsnotify_obtain_group(unsigned int group_num, | 308 | extern struct fsnotify_group *fsnotify_obtain_group(__u32 mask, |
316 | __u32 mask, | ||
317 | const struct fsnotify_ops *ops); | 309 | const struct fsnotify_ops *ops); |
318 | /* run all marks associated with this group and update group->mask */ | 310 | /* run all marks associated with this group and update group->mask */ |
319 | extern void fsnotify_recalc_group_mask(struct fsnotify_group *group); | 311 | extern void fsnotify_recalc_group_mask(struct fsnotify_group *group); |