diff options
| -rw-r--r-- | fs/btrfs/ioctl.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index f5c1c150d9f3..afbf3ac2079d 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
| @@ -2186,19 +2186,20 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp) | |||
| 2186 | struct btrfs_ioctl_defrag_range_args *range; | 2186 | struct btrfs_ioctl_defrag_range_args *range; |
| 2187 | int ret; | 2187 | int ret; |
| 2188 | 2188 | ||
| 2189 | if (btrfs_root_readonly(root)) | 2189 | ret = mnt_want_write_file(file); |
| 2190 | return -EROFS; | 2190 | if (ret) |
| 2191 | return ret; | ||
| 2191 | 2192 | ||
| 2192 | if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running, | 2193 | if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running, |
| 2193 | 1)) { | 2194 | 1)) { |
| 2194 | pr_info("btrfs: dev add/delete/balance/replace/resize operation in progress\n"); | 2195 | pr_info("btrfs: dev add/delete/balance/replace/resize operation in progress\n"); |
| 2196 | mnt_drop_write_file(file); | ||
| 2195 | return -EINVAL; | 2197 | return -EINVAL; |
| 2196 | } | 2198 | } |
| 2197 | ret = mnt_want_write_file(file); | 2199 | |
| 2198 | if (ret) { | 2200 | if (btrfs_root_readonly(root)) { |
| 2199 | atomic_set(&root->fs_info->mutually_exclusive_operation_running, | 2201 | ret = -EROFS; |
| 2200 | 0); | 2202 | goto out; |
| 2201 | return ret; | ||
| 2202 | } | 2203 | } |
| 2203 | 2204 | ||
| 2204 | switch (inode->i_mode & S_IFMT) { | 2205 | switch (inode->i_mode & S_IFMT) { |
| @@ -2250,8 +2251,8 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp) | |||
| 2250 | ret = -EINVAL; | 2251 | ret = -EINVAL; |
| 2251 | } | 2252 | } |
| 2252 | out: | 2253 | out: |
| 2253 | mnt_drop_write_file(file); | ||
| 2254 | atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0); | 2254 | atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0); |
| 2255 | mnt_drop_write_file(file); | ||
| 2255 | return ret; | 2256 | return ret; |
| 2256 | } | 2257 | } |
| 2257 | 2258 | ||
