aboutsummaryrefslogtreecommitdiffstats
path: root/fs/notify/fanotify
diff options
context:
space:
mode:
authorLino Sanfilippo <LinoSanfilippo@gmx.de>2011-06-14 11:29:51 -0400
committerEric Paris <eparis@redhat.com>2012-12-11 13:44:36 -0500
commite2a29943e9a2ee2aa737a77f550f46ba72269db4 (patch)
treecf0275eeed130433df241f115cbd2f9ebea96e7f /fs/notify/fanotify
parent986ab09807ca9454c3f54aae4db7e1bb00daeed3 (diff)
fsnotify: pass group to fsnotify_destroy_mark()
In fsnotify_destroy_mark() dont get the group from the passed mark anymore, but pass the group itself as an additional parameter to the function. Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de> Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'fs/notify/fanotify')
-rw-r--r--fs/notify/fanotify/fanotify_user.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 599a01952c74..1218d10424d0 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -546,7 +546,7 @@ static int fanotify_remove_vfsmount_mark(struct fsnotify_group *group,
546 removed = fanotify_mark_remove_from_mask(fsn_mark, mask, flags, 546 removed = fanotify_mark_remove_from_mask(fsn_mark, mask, flags,
547 &destroy_mark); 547 &destroy_mark);
548 if (destroy_mark) 548 if (destroy_mark)
549 fsnotify_destroy_mark(fsn_mark); 549 fsnotify_destroy_mark(fsn_mark, group);
550 550
551 fsnotify_put_mark(fsn_mark); 551 fsnotify_put_mark(fsn_mark);
552 if (removed & real_mount(mnt)->mnt_fsnotify_mask) 552 if (removed & real_mount(mnt)->mnt_fsnotify_mask)
@@ -570,7 +570,7 @@ static int fanotify_remove_inode_mark(struct fsnotify_group *group,
570 removed = fanotify_mark_remove_from_mask(fsn_mark, mask, flags, 570 removed = fanotify_mark_remove_from_mask(fsn_mark, mask, flags,
571 &destroy_mark); 571 &destroy_mark);
572 if (destroy_mark) 572 if (destroy_mark)
573 fsnotify_destroy_mark(fsn_mark); 573 fsnotify_destroy_mark(fsn_mark, group);
574 /* matches the fsnotify_find_inode_mark() */ 574 /* matches the fsnotify_find_inode_mark() */
575 fsnotify_put_mark(fsn_mark); 575 fsnotify_put_mark(fsn_mark);
576 if (removed & inode->i_fsnotify_mask) 576 if (removed & inode->i_fsnotify_mask)