diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-11-25 02:35:16 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:57:12 -0500 |
commit | c63181e6b6df89176b3984c6977bb5ec03d0df23 (patch) | |
tree | 2e6056a7d85e8df9dbf95e6fa4291f76a714c7c8 /fs/notify/fanotify/fanotify_user.c | |
parent | 52ba1621de1479ce7e52b6d167860462e483313c (diff) |
vfs: move fsnotify junk to struct mount
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/notify/fanotify/fanotify_user.c')
-rw-r--r-- | fs/notify/fanotify/fanotify_user.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 9fde1c00a296..3568c8a8b138 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c | |||
@@ -16,6 +16,8 @@ | |||
16 | 16 | ||
17 | #include <asm/ioctls.h> | 17 | #include <asm/ioctls.h> |
18 | 18 | ||
19 | #include "../../mount.h" | ||
20 | |||
19 | #define FANOTIFY_DEFAULT_MAX_EVENTS 16384 | 21 | #define FANOTIFY_DEFAULT_MAX_EVENTS 16384 |
20 | #define FANOTIFY_DEFAULT_MAX_MARKS 8192 | 22 | #define FANOTIFY_DEFAULT_MAX_MARKS 8192 |
21 | #define FANOTIFY_DEFAULT_MAX_LISTENERS 128 | 23 | #define FANOTIFY_DEFAULT_MAX_LISTENERS 128 |
@@ -546,7 +548,7 @@ static int fanotify_remove_vfsmount_mark(struct fsnotify_group *group, | |||
546 | 548 | ||
547 | removed = fanotify_mark_remove_from_mask(fsn_mark, mask, flags); | 549 | removed = fanotify_mark_remove_from_mask(fsn_mark, mask, flags); |
548 | fsnotify_put_mark(fsn_mark); | 550 | fsnotify_put_mark(fsn_mark); |
549 | if (removed & mnt->mnt_fsnotify_mask) | 551 | if (removed & real_mount(mnt)->mnt_fsnotify_mask) |
550 | fsnotify_recalc_vfsmount_mask(mnt); | 552 | fsnotify_recalc_vfsmount_mask(mnt); |
551 | 553 | ||
552 | return 0; | 554 | return 0; |
@@ -623,7 +625,7 @@ static int fanotify_add_vfsmount_mark(struct fsnotify_group *group, | |||
623 | } | 625 | } |
624 | added = fanotify_mark_add_to_mask(fsn_mark, mask, flags); | 626 | added = fanotify_mark_add_to_mask(fsn_mark, mask, flags); |
625 | 627 | ||
626 | if (added & ~mnt->mnt_fsnotify_mask) | 628 | if (added & ~real_mount(mnt)->mnt_fsnotify_mask) |
627 | fsnotify_recalc_vfsmount_mask(mnt); | 629 | fsnotify_recalc_vfsmount_mask(mnt); |
628 | err: | 630 | err: |
629 | fsnotify_put_mark(fsn_mark); | 631 | fsnotify_put_mark(fsn_mark); |