Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 207722
b: refs/heads/master
c: 3a9b16b
h: refs/heads/master
v: v3
  • Loading branch information
Eric Paris committed Jul 28, 2010
1 parent f195334 commit adc429f
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 26 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8778abb9a88fc4a74d8776ffaadf7214cf33c61e
refs/heads/master: 3a9b16b407f10b2a771bcae13fb5791e527d6bcf
4 changes: 3 additions & 1 deletion trunk/fs/notify/dnotify/dnotify.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ static void dnotify_recalc_inode_mask(struct fsnotify_mark *fsn_mark)
* events.
*/
static int dnotify_handle_event(struct fsnotify_group *group,
struct fsnotify_mark *mark,
struct fsnotify_event *event)
{
struct fsnotify_mark *fsn_mark = NULL;
Expand Down Expand Up @@ -130,7 +131,8 @@ static int dnotify_handle_event(struct fsnotify_group *group,
*/
static bool dnotify_should_send_event(struct fsnotify_group *group,
struct inode *inode, struct vfsmount *mnt,
__u32 mask, void *data, int data_type)
struct fsnotify_mark *mark, __u32 mask,
void *data, int data_type)
{
struct fsnotify_mark *fsn_mark;
bool send;
Expand Down
8 changes: 5 additions & 3 deletions trunk/fs/notify/fanotify/fanotify.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@ static int fanotify_get_response_from_access(struct fsnotify_group *group,
}
#endif

static int fanotify_handle_event(struct fsnotify_group *group, struct fsnotify_event *event)
static int fanotify_handle_event(struct fsnotify_group *group,
struct fsnotify_mark *mark,
struct fsnotify_event *event)
{
int ret = 0;
struct fsnotify_event *notify_event = NULL;
Expand Down Expand Up @@ -214,8 +216,8 @@ static bool should_send_inode_event(struct fsnotify_group *group, struct inode *
}

static bool fanotify_should_send_event(struct fsnotify_group *group, struct inode *to_tell,
struct vfsmount *mnt, __u32 mask, void *data,
int data_type)
struct vfsmount *mnt, struct fsnotify_mark *mark,
__u32 mask, void *data, int data_type)
{
pr_debug("%s: group=%p to_tell=%p mnt=%p mask=%x data=%p data_type=%d\n",
__func__, group, to_tell, mnt, mask, data, data_type);
Expand Down
19 changes: 10 additions & 9 deletions trunk/fs/notify/fsnotify.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,16 @@ void __fsnotify_flush_ignored_mask(struct inode *inode, void *data, int data_is)
}

static int send_to_group(struct fsnotify_group *group, struct inode *to_tell,
struct vfsmount *mnt, __u32 mask, void *data,
int data_is, u32 cookie, const unsigned char *file_name,
struct vfsmount *mnt, struct fsnotify_mark *mark,
__u32 mask, void *data, int data_is, u32 cookie,
const unsigned char *file_name,
struct fsnotify_event **event)
{
pr_debug("%s: group=%p to_tell=%p mnt=%p mask=%x data=%p data_is=%d"
" cookie=%d event=%p\n", __func__, group, to_tell, mnt,
mask, data, data_is, cookie, *event);
pr_debug("%s: group=%p to_tell=%p mnt=%p mark=%p mask=%x data=%p"
" 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, mask,
if (!group->ops->should_send_event(group, to_tell, mnt, mark, mask,
data, data_is))
return 0;
if (!*event) {
Expand All @@ -189,7 +190,7 @@ static int send_to_group(struct fsnotify_group *group, struct inode *to_tell,
if (!*event)
return -ENOMEM;
}
return group->ops->handle_event(group, *event);
return group->ops->handle_event(group, mark, *event);
}

static bool needed_by_vfsmount(__u32 test_mask, struct vfsmount *mnt)
Expand Down Expand Up @@ -252,7 +253,7 @@ int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is,
group = mark->group;
if (!group)
continue;
ret = send_to_group(group, to_tell, NULL, mask,
ret = send_to_group(group, to_tell, NULL, mark, mask,
data, data_is, cookie, file_name,
&event);
if (ret)
Expand All @@ -271,7 +272,7 @@ int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is,
group = mark->group;
if (!group)
continue;
ret = send_to_group(group, to_tell, mnt, mask,
ret = send_to_group(group, to_tell, mnt, mark, mask,
data, data_is, cookie, file_name,
&event);
if (ret)
Expand Down
8 changes: 5 additions & 3 deletions trunk/fs/notify/inotify/inotify_fsnotify.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ static struct fsnotify_event *inotify_merge(struct list_head *list,
return last_event;
}

static int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_event *event)
static int inotify_handle_event(struct fsnotify_group *group,
struct fsnotify_mark *mark,
struct fsnotify_event *event)
{
struct fsnotify_mark *fsn_mark;
struct inotify_inode_mark *i_mark;
Expand Down Expand Up @@ -148,8 +150,8 @@ static void inotify_freeing_mark(struct fsnotify_mark *fsn_mark, struct fsnotify
}

static bool inotify_should_send_event(struct fsnotify_group *group, struct inode *inode,
struct vfsmount *mnt, __u32 mask, void *data,
int data_type)
struct vfsmount *mnt, struct fsnotify_mark *mark,
__u32 mask, void *data, int data_type)
{
struct fsnotify_mark *fsn_mark;
bool send;
Expand Down
7 changes: 4 additions & 3 deletions trunk/include/linux/fsnotify_backend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,10 @@ struct fsnotify_event_private_data;
*/
struct fsnotify_ops {
bool (*should_send_event)(struct fsnotify_group *group, struct inode *inode,
struct vfsmount *mnt, __u32 mask, void *data,
int data_type);
int (*handle_event)(struct fsnotify_group *group, struct fsnotify_event *event);
struct vfsmount *mnt, struct fsnotify_mark *mark,
__u32 mask, void *data, int data_type);
int (*handle_event)(struct fsnotify_group *group, struct fsnotify_mark *mark,
struct fsnotify_event *event);
void (*free_group_priv)(struct fsnotify_group *group);
void (*freeing_mark)(struct fsnotify_mark *mark, struct fsnotify_group *group);
void (*free_event_priv)(struct fsnotify_event_private_data *priv);
Expand Down
8 changes: 5 additions & 3 deletions trunk/kernel/audit_tree.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,9 @@ static void evict_chunk(struct audit_chunk *chunk)
mutex_unlock(&audit_filter_mutex);
}

static int audit_tree_handle_event(struct fsnotify_group *group, struct fsnotify_event *event)
static int audit_tree_handle_event(struct fsnotify_group *group,
struct fsnotify_mark *mark,
struct fsnotify_event *event)
{
BUG();
return -EOPNOTSUPP;
Expand All @@ -918,8 +920,8 @@ static void audit_tree_freeing_mark(struct fsnotify_mark *entry, struct fsnotify
}

static bool audit_tree_send_event(struct fsnotify_group *group, struct inode *inode,
struct vfsmount *mnt, __u32 mask, void *data,
int data_type)
struct vfsmount *mnt, struct fsnotify_mark *mark,
__u32 mask, void *data, int data_type)
{
return 0;
}
Expand Down
8 changes: 5 additions & 3 deletions trunk/kernel/audit_watch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -511,8 +511,8 @@ void audit_remove_watch_rule(struct audit_krule *krule)
}

static bool audit_watch_should_send_event(struct fsnotify_group *group, struct inode *inode,
struct vfsmount *mnt, __u32 mask, void *data,
int data_type)
struct vfsmount *mnt, struct fsnotify_mark *mark,
__u32 mask, void *data, int data_type)
{
struct fsnotify_mark *entry;
bool send;
Expand All @@ -531,7 +531,9 @@ static bool audit_watch_should_send_event(struct fsnotify_group *group, struct i
}

/* Update watch data in audit rules based on fsnotify events. */
static int audit_watch_handle_event(struct fsnotify_group *group, struct fsnotify_event *event)
static int audit_watch_handle_event(struct fsnotify_group *group,
struct fsnotify_mark *mark,
struct fsnotify_event *event)
{
struct inode *inode;
__u32 mask = event->mask;
Expand Down

0 comments on commit adc429f

Please sign in to comment.