diff options
| author | Serge E. Hallyn <serge@hallyn.com> | 2011-03-24 00:43:26 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 03:47:13 +0100 |
| commit | 2e1496707560ecf98e9b0604622c0990f94861d3 (patch) | |
| tree | d1473b70fad31a903fedc87221680678a6c6c5f6 /fs/logfs/file.c | |
| parent | userns: userns: check user namespace for task->file uid equivalence checks (diff) | |
| download | linux-2e1496707560ecf98e9b0604622c0990f94861d3.tar.xz linux-2e1496707560ecf98e9b0604622c0990f94861d3.zip | |
userns: rename is_owner_or_cap to inode_owner_or_capable
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>
Diffstat (limited to 'fs/logfs/file.c')
| -rw-r--r-- | fs/logfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/logfs/file.c b/fs/logfs/file.c index e86376b87af1..c2ad7028def4 100644 --- a/fs/logfs/file.c +++ b/fs/logfs/file.c @@ -196,7 +196,7 @@ long logfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) if (IS_RDONLY(inode)) return -EROFS; - if (!is_owner_or_cap(inode)) + if (!inode_owner_or_capable(inode)) return -EACCES; err = get_user(flags, (int __user *)arg); |