X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=fs%2Fbtrfs%2Fioctl.c;h=2616f7ed47996a21df8b0c5de224c4b6c1aebf70;hp=3e7031d32eeffc1b03887a60ffff067eea499f22;hb=eed631e0d741d1a1067cfc6d709fdf2363126f9c;hpb=ebcb904dfe31644857422e3bb62e50f76fe86255

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 3e7031d32eef..2616f7ed4799 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -180,7 +180,7 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg)
 	if (ret)
 		return ret;
 
-	if (!is_owner_or_cap(inode))
+	if (!inode_owner_or_capable(inode))
 		return -EACCES;
 
 	mutex_lock(&inode->i_mutex);
@@ -1168,7 +1168,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);