AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

fsnotify: cleanup should_send_event

Browse Source 
The change to use srcu and walk the object list rather than the global
fsnotify_group list means that should_send_event is no longer needed for a
number of groups and can be simplified for others.  Do that.

Signed-off-by: Eric Paris <eparis@redhat.com>
This commit is contained in:
Eric Paris 2010-07-28 10:18:39 -04:00
parent 0215054f37
commit 2612abb51b
6 changed files with 16 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/notify/dnotify/dnotify.c
View File

@ -129,20 +129,11 @@ static bool dnotify_should_send_event(struct fsnotify_group *group,
struct fsnotify_mark *mark, __u32 mask,
void *data, int data_type)
{
bool send;
/* !dir_notify_enable should never get here, don't waste time checking
if (!dir_notify_enable)
return 0; */
/* not a dir, dnotify doesn't care */
if (!S_ISDIR(inode->i_mode))
return false;
mask = (mask & ~FS_EVENT_ON_CHILD);
send = (mask & mark->mask);
return send;
return true;
}
static void dnotify_free_mark(struct fsnotify_mark *fsn_mark)

23
fs/notify/fanotify/fanotify.c
View File

@ -185,22 +185,15 @@ static bool should_send_inode_event(struct fsnotify_group *group,
pr_debug("%s: group=%p inode=%p mark=%p mask=%x\n",
__func__, group, inode, mark, mask);
/* if the event is for a child and this inode doesn't care about
* events on the child, don't send it! */
/*
* if the event is for a child and this inode doesn't care about
* events on the child, don't send it!
*/
if ((mask & FS_EVENT_ON_CHILD) &&
!(mark->mask & FS_EVENT_ON_CHILD)) {
mask = 0;
} else {
/*
* We care about children, but do we care about this particular
* type of event?
*/
mask &= ~FS_EVENT_ON_CHILD;
mask &= mark->mask;
mask &= ~mark->ignored_mask;
}
return mask;
!(mark->mask & FS_EVENT_ON_CHILD))
return false;
else
return true;
}
static bool fanotify_should_send_event(struct fsnotify_group *group, struct inode *to_tell,

4
fs/notify/fsnotify.c
View File

@ -180,8 +180,8 @@ static int send_to_group(struct fsnotify_group *group, struct inode *to_tell,
" data_is=%d cookie=%d event=%p\n", __func__, group, to_tell,
mnt, mark, mask, data, data_is, cookie, *event);
if (!group->ops->should_send_event(group, to_tell, mnt, mark, mask,
data, data_is))
if (group->ops->should_send_event(group, to_tell, mnt, mark, mask,
data, data_is) == false)
return 0;
if (!*event) {
*event = fsnotify_create_event(to_tell, mask, data,

14
fs/notify/inotify/inotify_fsnotify.c
View File

@ -142,23 +142,15 @@ static bool inotify_should_send_event(struct fsnotify_group *group, struct inode
struct vfsmount *mnt, struct fsnotify_mark *mark,
__u32 mask, void *data, int data_type)
{
bool send;
pr_debug("%s: group=%p inode=%p mask=%x data=%p data_type=%d\n",
__func__, group, inode, mask, data, data_type);
mask = (mask & ~FS_EVENT_ON_CHILD);
send = (mark->mask & mask);
if (send && (mark->mask & FS_EXCL_UNLINK) &&
if ((mark->mask & FS_EXCL_UNLINK) &&
(data_type == FSNOTIFY_EVENT_FILE)) {
struct file *file = data;
if (d_unlinked(file->f_path.dentry))
send = false;
return false;
}
return send;
return true;
}
/*

2
kernel/audit_tree.c
View File

@ -923,7 +923,7 @@ static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *in
struct vfsmount *mnt, struct fsnotify_mark *mark,
__u32 mask, void *data, int data_type)
{
return 0;
return false;
}
static const struct fsnotify_ops audit_tree_ops = {

7
kernel/audit_watch.c
View File

@ -514,12 +514,7 @@ static bool audit_watch_should_send_event(struct fsnotify_group *group, struct i
struct vfsmount *mnt, struct fsnotify_mark *mark,
__u32 mask, void *data, int data_type)
{
bool send;
mask = (mask & ~FS_EVENT_ON_CHILD);
send = (mark->mask & mask);
return send;
return true;
}
/* Update watch data in audit rules based on fsnotify events. */