1 files changed, 6 insertions, 13 deletions

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 3828ad5fb8f1..1b31c130d034 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) {
@@ -1837,13 +1835,8 @@ void __audit_getname(const char *name)
         context->names[context->name_count].ino  = (unsigned long)-1;
         context->names[context->name_count].osid = 0;
         ++context->name_count;
-        if (!context->pwd.dentry) {
-                read_lock(&current->fs->lock);
-                context->pwd = current->fs->pwd;
-                path_get(&current->fs->pwd);
-                read_unlock(&current->fs->lock);
-        }
-
+        if (!context->pwd.dentry)
+                get_fs_pwd(current->fs, &context->pwd);
 }
 
 /* audit_putname - intercept a putname request