diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-16 22:06:18 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-16 22:06:18 +0200 |
| commit | dbb2816fc78abb0282a803bea1119e2f31354b20 (patch) | |
| tree | 5122c31321a6afcf8f9b99d823a22eba577f80d3 /fs/notify/group.c | |
| parent | Merge tag 'fbdev-v4.18' of git://github.com/bzolnier/linux (diff) | |
| parent | fsnotify: add fsnotify_add_inode_mark() wrappers (diff) | |
| download | linux-dbb2816fc78abb0282a803bea1119e2f31354b20.tar.xz linux-dbb2816fc78abb0282a803bea1119e2f31354b20.zip | |
Merge tag 'fsnotify_for_v4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull fsnotify updates from Jan Kara:
"fsnotify cleanups unifying handling of different watch types.
This is the shortened fsnotify series from Amir with the last five
patches pulled out. Amir has modified those patches to not change
struct inode but obviously it's too late for those to go into this
merge window"
* tag 'fsnotify_for_v4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
fsnotify: add fsnotify_add_inode_mark() wrappers
fanotify: generalize fanotify_should_send_event()
fsnotify: generalize send_to_group()
fsnotify: generalize iteration of marks by object type
fsnotify: introduce marks iteration helpers
fsnotify: remove redundant arguments to handle_event()
fsnotify: use type id to identify connector object type
Diffstat (limited to 'fs/notify/group.c')
| -rw-r--r-- | fs/notify/group.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/notify/group.c b/fs/notify/group.c index b7a4b6a69efa..aa5468f23e45 100644 --- a/fs/notify/group.c +++ b/fs/notify/group.c @@ -67,7 +67,7 @@ void fsnotify_destroy_group(struct fsnotify_group *group) fsnotify_group_stop_queueing(group); /* Clear all marks for this group and queue them for destruction */ - fsnotify_clear_marks_by_group(group, FSNOTIFY_OBJ_ALL_TYPES); + fsnotify_clear_marks_by_group(group, FSNOTIFY_OBJ_ALL_TYPES_MASK); /* * Some marks can still be pinned when waiting for response from |