git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
fs
/
btrfs
/
ioctl.c
diff --git
a/fs/btrfs/ioctl.c
b/fs/btrfs/ioctl.c
index
3e7031d
..
2616f7e
100644
(file)
--- 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 (ret)
return ret;
- if (!i
s_owner_or_cap
(inode))
+ if (!i
node_owner_or_capable
(inode))
return -EACCES;
mutex_lock(&inode->i_mutex);
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 (flags & ~BTRFS_SUBVOL_RDONLY)
return -EOPNOTSUPP;
- if (!i
s_owner_or_cap
(inode))
+ if (!i
node_owner_or_capable
(inode))
return -EACCES;
down_write(&root->fs_info->subvol_sem);
return -EACCES;
down_write(&root->fs_info->subvol_sem);