Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

* 'for-linus' of git://git.infradead.org/users/eparis/notify: (132 commits)
  fanotify: use both marks when possible
  fsnotify: pass both the vfsmount mark and inode mark
  fsnotify: walk the inode and vfsmount lists simultaneously
  fsnotify: rework ignored mark flushing
  fsnotify: remove global fsnotify groups lists
  fsnotify: remove group->mask
  fsnotify: remove the global masks
  fsnotify: cleanup should_send_event
  fanotify: use the mark in handler functions
  audit: use the mark in handler functions
  dnotify: use the mark in handler functions
  inotify: use the mark in handler functions
  fsnotify: send fsnotify_mark to groups in event handling functions
  fsnotify: Exchange list heads instead of moving elements
  fsnotify: srcu to protect read side of inode and vfsmount locks
  fsnotify: use an explicit flag to indicate fsnotify_destroy_mark has been called
  fsnotify: use _rcu functions for mark list traversal
  fsnotify: place marks on object in order of group memory address
  vfs/fsnotify: fsnotify_close can delay the final work in fput
  fsnotify: store struct file not struct path
  ...

Fix up trivial delete/modify conflict in fs/notify/inotify/inotify.c.

1 files changed, 4 insertions, 6 deletions

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 3828ad5fb8f1..b87a63beb66c 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -65,7 +65,6 @@
 #include <linux/binfmts.h>
 #include <linux/highmem.h>
 #include <linux/syscalls.h>
-#include <linux/inotify.h>
 #include <linux/capability.h>
 #include <linux/fs_struct.h>
 
@@ -549,9 +548,8 @@ static int audit_filter_rules(struct task_struct *tsk,
                         }
                         break;
                 case AUDIT_WATCH:
-                        if (name && audit_watch_inode(rule->watch) != (unsigned long)-1)
-                                result = (name->dev == audit_watch_dev(rule->watch) &&
-                                          name->ino == audit_watch_inode(rule->watch));
+                        if (name)
+                                result = audit_watch_compare(rule->watch, name->ino, name->dev);
                         break;
                 case AUDIT_DIR:
                         if (ctx)
@@ -1726,7 +1724,7 @@ static inline void handle_one(const struct inode *inode)
         struct audit_tree_refs *p;
         struct audit_chunk *chunk;
         int count;
-        if (likely(list_empty(&inode->inotify_watches)))
+        if (likely(hlist_empty(&inode->i_fsnotify_marks)))
                 return;
         context = current->audit_context;
         p = context->trees;
@@ -1769,7 +1767,7 @@ retry:
         seq = read_seqbegin(&rename_lock);
         for(;;) {
                 struct inode *inode = d->d_inode;
-                if (inode && unlikely(!list_empty(&inode->inotify_watches))) {
+                if (inode && unlikely(!hlist_empty(&inode->i_fsnotify_marks))) {
                         struct audit_chunk *chunk;
                         chunk = audit_tree_lookup(inode);
                         if (chunk) {