Commit daf475c9 authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: qgroup: Remove the unnecesaary spin lock for qgroup_rescan_running 



After the previous patch, qgroup_rescan_running is protected by
btrfs_fs_info::qgroup_rescan_lock, thus no need for the extra spinlock.

Suggested-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d61acbbf

fs/btrfs/qgroup.c

+0 −6
Original line number Diff line number Diff line
@@ -3238,7 +3238,6 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid, 
	}



	mutex_lock(&fs_info->qgroup_rescan_lock);

	spin_lock(&fs_info->qgroup_lock);



	if (init_flags) {

		if (fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN) {
@@ -3253,7 +3252,6 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid, 
		}



		if (ret) {

			spin_unlock(&fs_info->qgroup_lock);

			mutex_unlock(&fs_info->qgroup_rescan_lock);

			return ret;

		}
@@ -3264,8 +3262,6 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid, 
		sizeof(fs_info->qgroup_rescan_progress));

	fs_info->qgroup_rescan_progress.objectid = progress_objectid;

	init_completion(&fs_info->qgroup_rescan_completion);



	spin_unlock(&fs_info->qgroup_lock);

	mutex_unlock(&fs_info->qgroup_rescan_lock);



	btrfs_init_work(&fs_info->qgroup_rescan_work,
@@ -3342,9 +3338,7 @@ int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info, 
	int ret = 0;



	mutex_lock(&fs_info->qgroup_rescan_lock);

	spin_lock(&fs_info->qgroup_lock);

	running = fs_info->qgroup_rescan_running;

	spin_unlock(&fs_info->qgroup_lock);

	mutex_unlock(&fs_info->qgroup_rescan_lock);



	if (!running)

CRA Git | Maintained and supported by SUSTech CRA and CCSE