diff options
| author |   Zhao Lei <zhaolei@cn.fujitsu.com> | 2015-01-20 15:11:37 +0800 |
|---|---|---|
| committer |   Chris Mason <clm@fb.com> | 2015-01-21 18:06:48 -0800 |
| commit | 09dd7a01c3436344fb4c3974b275e016264e0a27 (patch) | |
| tree | 29176271e21e7331530408bd2f5cfae7bf88f935 /fs/btrfs/dev-replace.c | |
| parent | Btrfs: Remove noneed force_write in scrub_write_block_to_dev_replace (diff) | |
| download | linux-dev-09dd7a01c3436344fb4c3974b275e016264e0a27.tar.xz linux-dev-09dd7a01c3436344fb4c3974b275e016264e0a27.zip | |
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: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/dev-replace.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index ca6a3a3b6b6c..92109b7c865c 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -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: - 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 (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; } - } |