commit 7d9eb12c8739e7dc80c78c6b3596f912ecd8f941
author Chris Mason <chris.mason@oracle.com> Tue Jul 08 14:19:17 2008 -0400
committer Chris Mason <chris.mason@oracle.com> Thu Sep 25 11:04:04 2008 -0400
tree 000608285b44920f22e0888753b36299bc762cef
parent a7a16fd772620605c76e8ac8bdbc8ccc9e3df1a0

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

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

fs/btrfs/ioctl.c

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 026039a..83f17a5 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -307,8 +307,7 @@
 		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 @@
 	}
 
 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;