lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

userns: rename is_owner_or_cap to inode_owner_or_capable

Browse Source 
And give it a kernel-doc comment.

[akpm@linux-foundation.org: btrfs changed in linux-next]
Signed-off-by: Serge E. Hallyn <serge.hallyn@canonical.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Daniel Lezcano <daniel.lezcano@free.fr>
Acked-by: David Howells <dhowells@redhat.com>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Serge E. Hallyn
2011-03-23 16:43:26 -07:00
committed by Linus Torvalds
parent e795b71799
commit 2e14967075
30 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/ext3/ioctl.c
View File

@ -38,7 +38,7 @@ long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
unsigned int oldflags;
unsigned int jflag;
if (!is_owner_or_cap(inode))
if (!inode_owner_or_capable(inode))
return -EACCES;
if (get_user(flags, (int __user *) arg))
@ -123,7 +123,7 @@ flags_out:
__u32 generation;
int err;
if (!is_owner_or_cap(inode))
if (!inode_owner_or_capable(inode))
return -EPERM;
err = mnt_want_write(filp->f_path.mnt);
@ -192,7 +192,7 @@ setversion_out:
if (err)
return err;
if (!is_owner_or_cap(inode)) {
if (!inode_owner_or_capable(inode)) {
err = -EACCES;
goto setrsvsz_out;
}