diff options
| author | Bart Van Assche <bvanassche@acm.org> | 2014-10-07 08:45:21 -0600 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-06-05 21:16:55 +0100 |
| commit | eb7175dd1c6f0713d4312e745103354bb0abaed5 (patch) | |
| tree | 3584c37614df311aaa4ffbc7671befacc0448f30 /block | |
| parent | 2b39b5fe359bd353afbfca6c921567a964d18b11 (diff) | |
| download | linux-stable-eb7175dd1c6f0713d4312e745103354bb0abaed5.tar.gz linux-stable-eb7175dd1c6f0713d4312e745103354bb0abaed5.tar.bz2 linux-stable-eb7175dd1c6f0713d4312e745103354bb0abaed5.zip | |
blk-mq: Make bt_clear_tag() easier to read
commit 9d8f0bcca6ffa024a822ce4ab1008ab663f06672 upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq-tag.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index b88f4b375c27..05d8bc76d025 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -352,15 +352,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; } } |