diff options
| author | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:47:38 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:47:38 -0400 |
| commit | 72ed73c3f0801e860ee27e53ab6aaf47941ba324 (patch) | |
| tree | b46c546d77ee8931d47dafc97bf23b11472bffeb /fs/btrfs/ioctl.c | |
| parent | 883ae7992c09435927dda642b61f1455fceb5b85 (diff) | |
| parent | bd1573a5546b4351b5d042f1e4cd631ea67cc6b0 (diff) | |
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 5fdb2abc4fa7..d1bace3df9b6 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
| @@ -158,7 +158,7 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg) | |||
| 158 | FS_SYNC_FL | FS_DIRSYNC_FL)) | 158 | FS_SYNC_FL | FS_DIRSYNC_FL)) |
| 159 | return -EOPNOTSUPP; | 159 | return -EOPNOTSUPP; |
| 160 | 160 | ||
| 161 | if (!is_owner_or_cap(inode)) | 161 | if (!inode_owner_or_capable(inode)) |
| 162 | return -EACCES; | 162 | return -EACCES; |
| 163 | 163 | ||
| 164 | mutex_lock(&inode->i_mutex); | 164 | mutex_lock(&inode->i_mutex); |
| @@ -1077,7 +1077,7 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file, | |||
| 1077 | if (flags & ~BTRFS_SUBVOL_RDONLY) | 1077 | if (flags & ~BTRFS_SUBVOL_RDONLY) |
| 1078 | return -EOPNOTSUPP; | 1078 | return -EOPNOTSUPP; |
| 1079 | 1079 | ||
| 1080 | if (!is_owner_or_cap(inode)) | 1080 | if (!inode_owner_or_capable(inode)) |
| 1081 | return -EACCES; | 1081 | return -EACCES; |
| 1082 | 1082 | ||
| 1083 | down_write(&root->fs_info->subvol_sem); | 1083 | down_write(&root->fs_info->subvol_sem); |