Commit dad99ea7 authored by John Garry's avatar John Garry Committed by Zheng Zengkai
Browse files

blk-mq: Invert check in blk_mq_update_nr_requests() 

mainline inclusion
from mainline-v5.19-rc1
commit f6adcef5
category: performance
bugzilla: 186917, https://gitee.com/openeuler/kernel/issues/I5N1S5
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f6adcef5f317c78a899ca9766e90e47026834158



--------------------------------

It's easier to read:

if (x)
	X;
else
	Y;

over:

if (!x)
	Y;
else
	X;

No functional change intended.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/1633429419-228500-5-git-send-email-john.garry@huawei.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 76bea5f8

block/blk-mq.c

+5 −5
Original line number Diff line number Diff line
@@ -3764,10 +3764,7 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr) 
		 * If we're using an MQ scheduler, just update the scheduler

		 * queue depth. This is similar to what the old code would do.

		 */

		if (!hctx->sched_tags) {

			ret = blk_mq_tag_update_depth(hctx, &hctx->tags, nr,

							false);

		} else {

		if (hctx->sched_tags) {

			ret = blk_mq_tag_update_depth(hctx, &hctx->sched_tags,

						      nr, true);

			if (blk_mq_is_sbitmap_shared(set->flags)) {
@@ -3776,6 +3773,9 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr) 
				hctx->sched_tags->breserved_tags =

					&q->sched_breserved_tags;

			}

		} else {

			ret = blk_mq_tag_update_depth(hctx, &hctx->tags, nr,

						      false);

		}

		if (ret)

			break;