Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e149670 authored Mar 23, 2011 by Serge E. Hallyn Committed by Linus Torvalds Mar 23, 2011

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>

parent e795b717

fs/9p/acl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -323,7 +323,7 @@ static int v9fs_xattr_set_acl(struct dentry dentry, const char name,

		if (S_ISLNK(inode->i_mode))
		return -EOPNOTSUPP;
		if (!is_owner_or_cap(inode))
		if (!inode_owner_or_capable(inode))
		return -EPERM;
		if (value) {
		/* update the cached acl value */

fs/attr.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ int inode_change_ok(const struct inode inode, struct iattr attr)

		/* Make sure a caller can chmod. */
		if (ia_valid & ATTR_MODE) {
		if (!is_owner_or_cap(inode))
		if (!inode_owner_or_capable(inode))
		return -EPERM;
		/* Also check the setgid bit! */
		if (!in_group_p((ia_valid & ATTR_GID) ? attr->ia_gid :
		@@ -69,7 +69,7 @@ int inode_change_ok(const struct inode inode, struct iattr attr)

		/* Check for setting the inode time. */
		if (ia_valid & (ATTR_MTIME_SET \| ATTR_ATIME_SET \| ATTR_TIMES_SET)) {
		if (!is_owner_or_cap(inode))
		if (!inode_owner_or_capable(inode))
		return -EPERM;
		}

fs/btrfs/acl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@ static int btrfs_xattr_acl_set(struct dentry dentry, const char name,
		int ret;
		struct posix_acl *acl = NULL;

		if (!is_owner_or_cap(dentry->d_inode))
		if (!inode_owner_or_capable(dentry->d_inode))
		return -EPERM;

		if (!IS_POSIXACL(dentry->d_inode))

fs/btrfs/ioctl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -158,7 +158,7 @@ static int btrfs_ioctl_setflags(struct file file, void __user arg)
		FS_SYNC_FL \| FS_DIRSYNC_FL))
		return -EOPNOTSUPP;

		if (!is_owner_or_cap(inode))
		if (!inode_owner_or_capable(inode))
		return -EACCES;

		mutex_lock(&inode->i_mutex);
		@@ -1077,7 +1077,7 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file,
		if (flags & ~BTRFS_SUBVOL_RDONLY)
		return -EOPNOTSUPP;

		if (!is_owner_or_cap(inode))
		if (!inode_owner_or_capable(inode))
		return -EACCES;

		down_write(&root->fs_info->subvol_sem);

fs/ext2/acl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -406,7 +406,7 @@ ext2_xattr_set_acl(struct dentry dentry, const char name, const void *value,
		return -EINVAL;
		if (!test_opt(dentry->d_sb, POSIX_ACL))
		return -EOPNOTSUPP;
		if (!is_owner_or_cap(dentry->d_inode))
		if (!inode_owner_or_capable(dentry->d_inode))
		return -EPERM;

		if (value) {