From a7d01542c96d7a8ab420acf8b318d18ceeb6a833 Mon Sep 17 00:00:00 2001
From: Stefan Behrens <sbehrens@giantdisaster.de>
Date: Mon, 4 Mar 2013 17:28:38 +0000
Subject: [PATCH] --- yaml --- r: 361007 b: refs/heads/master c:
 9b53157aac7366cea413ee29b629f83225829e87 h: refs/heads/master i:   361005:
 945d75fa28fc08d286659a952f1d672c1c61fab6   361003:
 5d391d2eb36d5c5129e65ed593ec0952f749ad3c   360999:
 ad5c3197927cbc9be2a613521633c2f579bd1cf0   360991:
 5ed30654d5a0099cca7e755a0f96103ef28c7115 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/ioctl.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index ba349d626541..c86694a0d97a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66b6135b7cf741f6f44ba938b27583ea3b83bd12
+refs/heads/master: 9b53157aac7366cea413ee29b629f83225829e87
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index 3fdfabcc1aaa..898c5729e7e5 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -2245,13 +2245,6 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp)
 	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");
-		mnt_drop_write_file(file);
-		return -EINVAL;
-	}
-
 	if (btrfs_root_readonly(root)) {
 		ret = -EROFS;
 		goto out;
@@ -2306,7 +2299,6 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp)
 		ret = -EINVAL;
 	}
 out:
-	atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0);
 	mnt_drop_write_file(file);
 	return ret;
 }