Hello Linus, could you please pull from git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git fsnotify_for_v4.18-rc1 to get several fsnotify cleanups unifying handling of different watch types. Top of the tree is 3be4aaf4e2d3. The full shortlog is: Amir Goldstein (12): fsnotify: use type id to identify connector object type fsnotify: remove redundant arguments to handle_event() fsnotify: introduce marks iteration helpers fsnotify: generalize iteration of marks by object type fsnotify: generalize send_to_group() fanotify: generalize fanotify_should_send_event() fsnotify: add fsnotify_add_inode_mark() wrappers fsnotify: introduce prototype struct fsnotify_obj fsnotify: pass fsnotify_obj instead of **connp argument fsnotify: pass object and object type to fsnotify_add_mark() fsnotify: let connector point to abstract fsnotify_obj fanotify: factor out helpers to add/remove mark The diffstat is fs/inode.c | 2 +- fs/mount.h | 11 ++- fs/notify/dnotify/dnotify.c | 16 ++-- fs/notify/fanotify/fanotify.c | 46 +++++----- fs/notify/fanotify/fanotify_user.c | 98 ++++++++------------- fs/notify/fdinfo.c | 12 +-- fs/notify/fsnotify.c | 160 ++++++++++++++++++++--------------- fs/notify/fsnotify.h | 14 +-- fs/notify/group.c | 2 +- fs/notify/inotify/inotify.h | 2 - fs/notify/inotify/inotify_fsnotify.c | 6 +- fs/notify/inotify/inotify_user.c | 16 ++-- fs/notify/mark.c | 140 ++++++++++++++---------------- include/linux/fs.h | 20 +++-- include/linux/fsnotify_backend.h | 109 +++++++++++++++++++----- include/linux/fsnotify_obj.h | 18 ++++ kernel/audit_fsnotify.c | 5 +- kernel/audit_tree.c | 22 +++-- kernel/audit_watch.c | 7 +- kernel/auditsc.c | 4 +- 20 files changed, 396 insertions(+), 314 deletions(-) create mode 100644 include/linux/fsnotify_obj.h Thanks Honza -- Jan Kara <jack@xxxxxxxx> SUSE Labs, CR