Jan, Per your request, here is the prep series for super block mark, with all review comments addressed and rebased on your for_next branch. For those interested in the super block marks work, here are the patches [1] and ltp tests [2]. I hope we can iron out any remaining concerns during LSF/MM. Thanks, Amir. [1] https://github.com/amir73il/linux/commits/fanotify_sb [2] https://github.com/amir73il/ltp/commits/fanotify_sb Changes since v2: - Some fix patches already merged - Remove patches that implement super block mark - Refernce abstract fsnotify_obj from connector - Address Jan's review comments on type iteration helpers - Better names for helpers and report_mask Amir Goldstein (13): 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: add fsnotify_connector_inode() wrapper fsnotify: let connector point to abstract fsnotify_obj fanotify: factor out helpers to add/remove mark fs/inode.c | 2 +- fs/mount.h | 11 ++- fs/notify/dnotify/dnotify.c | 16 ++-- fs/notify/fanotify/fanotify.c | 48 +++++------ 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 | 6 +- include/linux/fsnotify_backend.h | 120 +++++++++++++++++++++----- include/linux/fsnotify_obj.h | 14 +++ kernel/audit_fsnotify.c | 5 +- kernel/audit_tree.c | 20 ++--- kernel/audit_watch.c | 7 +- kernel/auditsc.c | 4 +- 20 files changed, 392 insertions(+), 311 deletions(-) create mode 100644 include/linux/fsnotify_obj.h -- 2.7.4