aboutsummaryrefslogtreecommitdiff
path: root/fs/xattr.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-23 12:24:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-23 12:24:19 -0700
commit79c1cb7a8ca8f08cd78f7c5eebc85bbe937f5ad4 (patch)
tree0dafecbb8f729aed249e5ff66daa21a6136759c6 /fs/xattr.c
parentb0d19a378a409373244088511e889957645f2a44 (diff)
parent97e7e0f71d6d948c25f11f0a33878d9356d9579e (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: [patch 7/7] vfs: mountinfo: show dominating group id [patch 6/7] vfs: mountinfo: add /proc/<pid>/mountinfo [patch 5/7] vfs: mountinfo: allow using process root [patch 4/7] vfs: mountinfo: add mount peer group ID [patch 3/7] vfs: mountinfo: add mount ID [patch 2/7] vfs: mountinfo: add seq_file_root() [patch 1/7] vfs: mountinfo: add dentry_path() [PATCH] remove unused label in xattr.c (noise from ro-bind)
Diffstat (limited to 'fs/xattr.c')
-rw-r--r--fs/xattr.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xattr.c b/fs/xattr.c
index f7062da505d..89a942f07e1 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -307,7 +307,6 @@ sys_fsetxattr(int fd, char __user *name, void __user *value,
error = setxattr(dentry, name, value, size, flags);
mnt_drop_write(f->f_path.mnt);
}
-out_fput:
fput(f);
return error;
}