diff options
author | Serge E. Hallyn <serge@hallyn.com> | 2011-03-23 19:43:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-23 22:47:13 -0400 |
commit | 2e1496707560ecf98e9b0604622c0990f94861d3 (patch) | |
tree | d1473b70fad31a903fedc87221680678a6c6c5f6 /include | |
parent | e795b71799ff0b27365020c9ddaa25d0d83f99c8 (diff) |
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 'include')
-rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 9eebc646d14a..4dda076c24a1 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1463,7 +1463,7 @@ enum { | |||
1463 | */ | 1463 | */ |
1464 | extern struct user_namespace init_user_ns; | 1464 | extern struct user_namespace init_user_ns; |
1465 | #define inode_userns(inode) (&init_user_ns) | 1465 | #define inode_userns(inode) (&init_user_ns) |
1466 | extern bool is_owner_or_cap(const struct inode *inode); | 1466 | extern bool inode_owner_or_capable(const struct inode *inode); |
1467 | 1467 | ||
1468 | /* not quite ready to be deprecated, but... */ | 1468 | /* not quite ready to be deprecated, but... */ |
1469 | extern void lock_super(struct super_block *); | 1469 | extern void lock_super(struct super_block *); |