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

Commit 09dd7a01 authored by Zhao Lei's avatar Zhao Lei Committed by Chris Mason
Browse files

Btrfs: Cleanup btrfs_bio_counter_inc_blocked() 



1: Remove no-need DEFINE_WAIT(wait)
2: Add likely() for BTRFS_FS_STATE_DEV_REPLACING condition
3: Use while loop instead of goto

Signed-off-by: default avatarZhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 114ab50d

fs/btrfs/dev-replace.c

+6 −6
Original line number Diff line number Diff line
@@ -932,15 +932,15 @@ void btrfs_bio_counter_sub(struct btrfs_fs_info *fs_info, s64 amount) 


void btrfs_bio_counter_inc_blocked(struct btrfs_fs_info *fs_info)

{

	DEFINE_WAIT(wait);

again:

	while (1) {

		percpu_counter_inc(&fs_info->bio_counter);

	if (test_bit(BTRFS_FS_STATE_DEV_REPLACING, &fs_info->fs_state)) {

		if (likely(!test_bit(BTRFS_FS_STATE_DEV_REPLACING,

				     &fs_info->fs_state)))

			break;



		btrfs_bio_counter_dec(fs_info);

		wait_event(fs_info->replace_wait,

			   !test_bit(BTRFS_FS_STATE_DEV_REPLACING,

				     &fs_info->fs_state));

		goto again;

	}



}