linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / xattr.c

diff --git a/fs/xattr.c b/fs/xattr.c
index 1422a01..ad83a51 100644 (file)
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -17,7 +17,6 @@
 #include <linux/syscalls.h>
 #include <linux/module.h>
 #include <linux/fsnotify.h>
-#include <linux/audit.h>
 #include <linux/mount.h>
 #include <asm/uaccess.h>
 
@@ -239,15 +238,12 @@ sys_fsetxattr(int fd, char __user *name, void __user *value,
              size_t size, int flags)
 {
        struct file *f;
-       struct dentry *dentry;
        int error = -EBADF;
 
        f = fget(fd);
        if (!f)
                return error;
-       dentry = f->f_dentry;
-       audit_inode(NULL, dentry->d_inode);
-       error = setxattr(dentry, name, value, size, flags, f->f_vfsmnt);
+       error = setxattr(f->f_dentry, name, value, size, flags, f->f_vfsmnt);
        fput(f);
        return error;
 }
@@ -469,15 +465,12 @@ asmlinkage long
 sys_fremovexattr(int fd, char __user *name)
 {
        struct file *f;
-       struct dentry *dentry;
        int error = -EBADF;
 
        f = fget(fd);
        if (!f)
                return error;
-       dentry = f->f_dentry;
-       audit_inode(NULL, dentry->d_inode);
-       error = removexattr(dentry, name, f->f_vfsmnt);
+       error = removexattr(f->f_dentry, name, f->f_vfsmnt);
        fput(f);
        return error;
 }