Skip to content

Commit

Permalink
switch xattr syscalls to fget_light/fput_light
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed May 30, 2012
1 parent 863ced7 commit 7449af1
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions fs/xattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -399,11 +399,12 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
const void __user *,value, size_t, size, int, flags)
{
int fput_needed;
struct file *f;
struct dentry *dentry;
int error = -EBADF;

f = fget(fd);
f = fget_light(fd, &fput_needed);
if (!f)
return error;
dentry = f->f_path.dentry;
Expand All @@ -413,7 +414,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
error = setxattr(dentry, name, value, size, flags);
mnt_drop_write_file(f);
}
fput(f);
fput_light(f, fput_needed);
return error;
}

Expand Down Expand Up @@ -486,15 +487,16 @@ SYSCALL_DEFINE4(lgetxattr, const char __user *, pathname,
SYSCALL_DEFINE4(fgetxattr, int, fd, const char __user *, name,
void __user *, value, size_t, size)
{
int fput_needed;
struct file *f;
ssize_t error = -EBADF;

f = fget(fd);
f = fget_light(fd, &fput_needed);
if (!f)
return error;
audit_inode(NULL, f->f_path.dentry);
error = getxattr(f->f_path.dentry, name, value, size);
fput(f);
fput_light(f, fput_needed);
return error;
}

Expand Down Expand Up @@ -566,15 +568,16 @@ SYSCALL_DEFINE3(llistxattr, const char __user *, pathname, char __user *, list,

SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
{
int fput_needed;
struct file *f;
ssize_t error = -EBADF;

f = fget(fd);
f = fget_light(fd, &fput_needed);
if (!f)
return error;
audit_inode(NULL, f->f_path.dentry);
error = listxattr(f->f_path.dentry, list, size);
fput(f);
fput_light(f, fput_needed);
return error;
}

Expand Down Expand Up @@ -634,11 +637,12 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,

SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
{
int fput_needed;
struct file *f;
struct dentry *dentry;
int error = -EBADF;

f = fget(fd);
f = fget_light(fd, &fput_needed);
if (!f)
return error;
dentry = f->f_path.dentry;
Expand All @@ -648,7 +652,7 @@ SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
error = removexattr(dentry, name);
mnt_drop_write_file(f);
}
fput(f);
fput_light(f, fput_needed);
return error;
}

Expand Down

0 comments on commit 7449af1

Please sign in to comment.