Commit d06f23d6 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Chris Mason
Browse files

btrfs: waiting on qgroup rescan should not always be interruptible 



We wait on qgroup rescan completion in three places: file system
shutdown, the quota disable ioctl, and the rescan wait ioctl.  If the
user sends a signal while we're waiting, we continue happily along.  This
is expected behavior for the rescan wait ioctl.  It's racy in the shutdown
path but mostly works due to other unrelated synchronization points.
In the quota disable path, it Oopses the kernel pretty much immediately.

Cc: <stable@vger.kernel.org> # v4.4+
Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent d2c609b8

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -3864,7 +3864,7 @@ void close_ctree(struct btrfs_root *root) 
	smp_mb();



	/* wait for the qgroup rescan worker to stop */

	btrfs_qgroup_wait_for_completion(fs_info);

	btrfs_qgroup_wait_for_completion(fs_info, false);



	/* wait for the uuid_scan task to finish */

	down(&fs_info->uuid_tree_rescan_sem);

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -5084,7 +5084,7 @@ static long btrfs_ioctl_quota_rescan_wait(struct file *file, void __user *arg) 
	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;



	return btrfs_qgroup_wait_for_completion(root->fs_info);

	return btrfs_qgroup_wait_for_completion(root->fs_info, true);

}



static long _btrfs_ioctl_set_received_subvol(struct file *file,

fs/btrfs/qgroup.c

+9 −3
Original line number Diff line number Diff line
@@ -995,7 +995,7 @@ int btrfs_quota_disable(struct btrfs_trans_handle *trans, 
		goto out;

	fs_info->quota_enabled = 0;

	fs_info->pending_quota_state = 0;

	btrfs_qgroup_wait_for_completion(fs_info);

	btrfs_qgroup_wait_for_completion(fs_info, false);

	spin_lock(&fs_info->qgroup_lock);

	quota_root = fs_info->quota_root;

	fs_info->quota_root = NULL;
@@ -2494,7 +2494,8 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info) 
	return 0;

}



int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info)

int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info,

				     bool interruptible)

{

	int running;

	int ret = 0;
@@ -2505,9 +2506,14 @@ int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info) 
	spin_unlock(&fs_info->qgroup_lock);

	mutex_unlock(&fs_info->qgroup_rescan_lock);



	if (running)

	if (!running)

		return 0;



	if (interruptible)

		ret = wait_for_completion_interruptible(

					&fs_info->qgroup_rescan_completion);

	else

		wait_for_completion(&fs_info->qgroup_rescan_completion);



	return ret;

}

fs/btrfs/qgroup.h

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ int btrfs_quota_disable(struct btrfs_trans_handle *trans, 
			struct btrfs_fs_info *fs_info);

int btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info);

void btrfs_qgroup_rescan_resume(struct btrfs_fs_info *fs_info);

int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info);

int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info,

				     bool interruptible);

int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans,

			      struct btrfs_fs_info *fs_info, u64 src, u64 dst);

int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans,

CRA Git | Maintained and supported by SUSTech CRA and CCSE