|
@@ -1298,12 +1298,13 @@ out_ra:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static noinline int btrfs_ioctl_resize(struct btrfs_root *root,
|
|
|
+static noinline int btrfs_ioctl_resize(struct file *file,
|
|
|
void __user *arg)
|
|
|
{
|
|
|
u64 new_size;
|
|
|
u64 old_size;
|
|
|
u64 devid = 1;
|
|
|
+ struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root;
|
|
|
struct btrfs_ioctl_vol_args *vol_args;
|
|
|
struct btrfs_trans_handle *trans;
|
|
|
struct btrfs_device *device = NULL;
|
|
@@ -1318,6 +1319,10 @@ static noinline int btrfs_ioctl_resize(struct btrfs_root *root,
|
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
|
return -EPERM;
|
|
|
|
|
|
+ ret = mnt_want_write_file(file);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
+
|
|
|
if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running,
|
|
|
1)) {
|
|
|
pr_info("btrfs: dev add/delete/balance/replace/resize operation in progress\n");
|
|
@@ -1425,6 +1430,7 @@ out_free:
|
|
|
kfree(vol_args);
|
|
|
out:
|
|
|
mutex_unlock(&root->fs_info->volume_mutex);
|
|
|
+ mnt_drop_write_file(file);
|
|
|
atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0);
|
|
|
return ret;
|
|
|
}
|
|
@@ -3832,7 +3838,7 @@ long btrfs_ioctl(struct file *file, unsigned int
|
|
|
case BTRFS_IOC_DEFRAG_RANGE:
|
|
|
return btrfs_ioctl_defrag(file, argp);
|
|
|
case BTRFS_IOC_RESIZE:
|
|
|
- return btrfs_ioctl_resize(root, argp);
|
|
|
+ return btrfs_ioctl_resize(file, argp);
|
|
|
case BTRFS_IOC_ADD_DEV:
|
|
|
return btrfs_ioctl_add_dev(root, argp);
|
|
|
case BTRFS_IOC_RM_DEV:
|