From: Zhao Lei <[email protected]> 1: Remove unused DEFINE_WAIT(wait) 2: Use a loop instead of goto
Changelog v2->v3: s/look/loop in description. Changelog v1->v2: Remove likely() in v1 because it is not a performance sensitive path, suggesed by: David Sterba <[email protected]> Acked-by: David Sterba <[email protected]> Signed-off-by: Zhao Lei <[email protected]> --- fs/btrfs/dev-replace.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index ca6a3a3..e444eeb 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -932,15 +932,14 @@ 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: - percpu_counter_inc(&fs_info->bio_counter); - if (test_bit(BTRFS_FS_STATE_DEV_REPLACING, &fs_info->fs_state)) { + while (1) { + percpu_counter_inc(&fs_info->bio_counter); + if (!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; } - } -- 1.8.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
