1 files changed, 8 insertions, 17 deletions

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index ca6a3a3b6b6c..5ec03d999c37 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -440,18 +440,9 @@ leave:
  */
 static void btrfs_rm_dev_replace_blocked(struct btrfs_fs_info *fs_info)
 {
-        s64 writers;
-        DEFINE_WAIT(wait);
-
         set_bit(BTRFS_FS_STATE_DEV_REPLACING, &fs_info->fs_state);
-        do {
-                prepare_to_wait(&fs_info->replace_wait, &wait,
-                                TASK_UNINTERRUPTIBLE);
-                writers = percpu_counter_sum(&fs_info->bio_counter);
-                if (writers)
-                        schedule();
-                finish_wait(&fs_info->replace_wait, &wait);
-        } while (writers);
+        wait_event(fs_info->replace_wait, !percpu_counter_sum(
+                   &fs_info->bio_counter));
 }
 
 /*
@@ -932,15 +923,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;
         }
-
 }