Merge master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev

[linux-drm-fsl-dcu.git] / fs / xattr.c

diff --git a/fs/xattr.c b/fs/xattr.c
index 38646132ab0e29ec4c8ab8a4d3c7bbb491eaeaeb..4523aca79659c24f5d2ca3b8ee415ddd9588b73f 100644 (file)
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -9,7 +9,6 @@
  */
 #include <linux/fs.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/file.h>
 #include <linux/xattr.h>
 #include <linux/namei.h>
@@ -351,6 +350,7 @@ sys_fgetxattr(int fd, char __user *name, void __user *value, size_t size)
        f = fget(fd);
        if (!f)
                return error;
+       audit_inode(NULL, f->f_path.dentry->d_inode);
        error = getxattr(f->f_path.dentry, name, value, size);
        fput(f);
        return error;
@@ -423,6 +423,7 @@ sys_flistxattr(int fd, char __user *list, size_t size)
        f = fget(fd);
        if (!f)
                return error;
+       audit_inode(NULL, f->f_path.dentry->d_inode);
        error = listxattr(f->f_path.dentry, list, size);
        fput(f);
        return error;