Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b53157a authored by Stefan Behrens's avatar Stefan Behrens Committed by Josef Bacik
Browse files

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: default avatarStefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 66b6135b

fs/btrfs/ioctl.c

+0 −8
Original line number Diff line number Diff line
@@ -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;

}