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

Commit b708ce96 authored by Zhaolei's avatar Zhaolei Committed by Chris Mason
Browse files

btrfs: use scrub_pause_on/off() to reduce code in scrub_enumerate_chunks() 



Use new intruduced scrub_pause_on/off() can make this code block
clean and more readable.

Signed-off-by: default avatarZhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 0e22be89

fs/btrfs/scrub.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -3503,8 +3503,8 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx, 




		wait_event(sctx->list_wait,

		wait_event(sctx->list_wait,

			   atomic_read(&sctx->bios_in_flight) == 0);

			   atomic_read(&sctx->bios_in_flight) == 0);

		atomic_inc(&fs_info->scrubs_paused);



		wake_up(&fs_info->scrub_pause_wait);

		scrub_pause_on(fs_info);





		/*

		/*

		 * must be called before we decrease @scrub_paused.

		 * must be called before we decrease @scrub_paused.
@@ -3515,11 +3515,7 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx, 
			   atomic_read(&sctx->workers_pending) == 0);

			   atomic_read(&sctx->workers_pending) == 0);

		atomic_set(&sctx->wr_ctx.flush_all_writes, 0);

		atomic_set(&sctx->wr_ctx.flush_all_writes, 0);





		mutex_lock(&fs_info->scrub_lock);

		scrub_pause_off(fs_info);

		__scrub_blocked_if_needed(fs_info);

		atomic_dec(&fs_info->scrubs_paused);

		mutex_unlock(&fs_info->scrub_lock);

		wake_up(&fs_info->scrub_pause_wait);





		btrfs_put_block_group(cache);

		btrfs_put_block_group(cache);

		if (ret)

		if (ret)