Btrfs: Add locking around volume management (device add/remove/balance)

Signed-off-by: Chris Mason <chris.mason@oracle.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 026039a2ac58..83f17a5cbd6a 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -307,8 +307,7 @@ static int btrfs_ioctl_resize(struct btrfs_root *root, void __user *arg)
                 goto out;
         }
 
-        mutex_lock(&root->fs_info->alloc_mutex);
-        mutex_lock(&root->fs_info->chunk_mutex);
+        mutex_lock(&root->fs_info->volume_mutex);
         sizestr = vol_args->name;
         devstr = strchr(sizestr, ':');
         if (devstr) {
@@ -378,8 +377,7 @@ static int btrfs_ioctl_resize(struct btrfs_root *root, void __user *arg)
         }
 
 out_unlock:
-        mutex_lock(&root->fs_info->alloc_mutex);
-        mutex_lock(&root->fs_info->chunk_mutex);
+        mutex_unlock(&root->fs_info->volume_mutex);
 out:
         kfree(vol_args);
         return ret;