blk-mq: Make bt_clear_tag() easier to read

Eliminate a backwards goto statement from bt_clear_tag().

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index 146fd02659ec..8317175a3009 100644
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -351,15 +351,12 @@ static void bt_clear_tag(struct blk_mq_bitmap_tags *bt, unsigned int tag)
                 return;
 
         wait_cnt = atomic_dec_return(&bs->wait_cnt);
+        if (unlikely(wait_cnt < 0))
+                wait_cnt = atomic_inc_return(&bs->wait_cnt);
         if (wait_cnt == 0) {
-wake:
                 atomic_add(bt->wake_cnt, &bs->wait_cnt);
                 bt_index_atomic_inc(&bt->wake_index);
                 wake_up(&bs->wait);
-        } else if (wait_cnt < 0) {
-                wait_cnt = atomic_inc_return(&bs->wait_cnt);
-                if (!wait_cnt)
-                        goto wake;
         }
 }