瀏覽代碼

Btrfs: allow running defrag in parallel to administrative tasks

Commit 5ac00add added a testnset mutex and code that disallows
running administrative tasks in parallel. It is prevented that
the device add/delete/balance/replace/resize operations are
started in parallel. By mistake, the defragmentation operation
was included in the check for mutually exclusiveness as well.
This is fixed with this commit.

Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Stefan Behrens 12 年之前
父節點
當前提交
9b53157aac
共有 1 個文件被更改,包括 0 次插入8 次删除
  1. 0 8
      fs/btrfs/ioctl.c

+ 0 - 8
fs/btrfs/ioctl.c

@@ -2245,13 +2245,6 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp)
 	if (ret)
 	if (ret)
 		return 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)) {
 	if (btrfs_root_readonly(root)) {
 		ret = -EROFS;
 		ret = -EROFS;
 		goto out;
 		goto out;
@@ -2306,7 +2299,6 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp)
 		ret = -EINVAL;
 		ret = -EINVAL;
 	}
 	}
 out:
 out:
-	atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0);
 	mnt_drop_write_file(file);
 	mnt_drop_write_file(file);
 	return ret;
 	return ret;
 }
 }