Jan, This is the part of the series that was not merged to v4.18-rc1, after addressing Linus' concerns. We already had several review cycles on the branch in my tree since v3, but this is 4th official posting. Note that per your request, I changed fsnotify_obj_{inode,mount} to fsnotify_conn_{inode,mount}, but that was easier to do after the patch that introduces obj->conn, so the helpers fsnotify_obj_{inode,mount} are added and then modified. Thanks, Amir. Changes since v3: - Some cleanup patches already merged to v4.18-rc1 - Replace struct fsnotify_obj with fsnotify_connp_t type - Leave explicit connector pointer in struct inode (Linus) - Use helper to get mask from any connector type Amir Goldstein (5): fsnotify: use typedef fsnotify_connp_t for brevity fsnotify: pass connp and object type to fsnotify_add_mark() fsnotify: let connector point to an abstract object fsnotify: add helper to get mask from connector fanotify: factor out helpers to add/remove mark fs/notify/fanotify/fanotify_user.c | 99 +++++++++++++---------------------- fs/notify/fdinfo.c | 8 +-- fs/notify/fsnotify.h | 16 +++++- fs/notify/mark.c | 103 ++++++++++++++++++++----------------- include/linux/fsnotify_backend.h | 40 +++++++++----- kernel/audit_tree.c | 17 +++--- 6 files changed, 147 insertions(+), 136 deletions(-) -- 2.7.4