X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fxattr.c;h=ad83a51e74a9e4d5081c53e1a54675a9d6cfe841;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=1940c63f1cdc9fb7a42695c61442eff012e93765;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/fs/xattr.c b/fs/xattr.c
index 1940c63f1..ad83a51e7 100644
--- 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, 0);
-	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, 0);
-	error = removexattr(dentry, name, f->f_vfsmnt);
+	error = removexattr(f->f_dentry, name, f->f_vfsmnt);
 	fput(f);
 	return error;
 }