diff options
| author | David S. Miller <davem@davemloft.net> | 2018-09-12 22:22:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-12 22:22:42 -0700 |
| commit | aaf9253025e80cf8f62d7b33670e84e838eec5a3 (patch) | |
| tree | f13b307c8407cc05ff803c4d7f6a0967d85ce3ec /fs/notify/fsnotify.c | |
| parent | a20625e49ddefc250c221478fb0dc62ea27722a6 (diff) | |
| parent | 7428b2e5d0b195f2a5e40f91d2b41a8503fcfe68 (diff) | |
| download | blackbird-obmc-linux-aaf9253025e80cf8f62d7b33670e84e838eec5a3.tar.gz blackbird-obmc-linux-aaf9253025e80cf8f62d7b33670e84e838eec5a3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'fs/notify/fsnotify.c')
| -rw-r--r-- | fs/notify/fsnotify.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c index f174397b63a0..ababdbfab537 100644 --- a/fs/notify/fsnotify.c +++ b/fs/notify/fsnotify.c @@ -351,16 +351,9 @@ int fsnotify(struct inode *to_tell, __u32 mask, const void *data, int data_is, iter_info.srcu_idx = srcu_read_lock(&fsnotify_mark_srcu); - if ((mask & FS_MODIFY) || - (test_mask & to_tell->i_fsnotify_mask)) { - iter_info.marks[FSNOTIFY_OBJ_TYPE_INODE] = - fsnotify_first_mark(&to_tell->i_fsnotify_marks); - } - - if (mnt && ((mask & FS_MODIFY) || - (test_mask & mnt->mnt_fsnotify_mask))) { - iter_info.marks[FSNOTIFY_OBJ_TYPE_INODE] = - fsnotify_first_mark(&to_tell->i_fsnotify_marks); + iter_info.marks[FSNOTIFY_OBJ_TYPE_INODE] = + fsnotify_first_mark(&to_tell->i_fsnotify_marks); + if (mnt) { iter_info.marks[FSNOTIFY_OBJ_TYPE_VFSMOUNT] = fsnotify_first_mark(&mnt->mnt_fsnotify_marks); } |
