From: John Garry <john.garry@huawei.com>
To: <axboe@kernel.dk>
Cc: <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-scsi@vger.kernel.org>, <ming.lei@redhat.com>,
<hare@suse.de>, "John Garry" <john.garry@huawei.com>
Subject: [PATCH v4 04/13] blk-mq: Invert check in blk_mq_update_nr_requests()
Date: Fri, 24 Sep 2021 16:28:21 +0800 [thread overview]
Message-ID: <1632472110-244938-5-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1632472110-244938-1-git-send-email-john.garry@huawei.com>
It's easier to read:
if (x)
X;
else
Y;
over:
if (!x)
Y;
else
X;
No functional change intended.
Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---
block/blk-mq.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 1a4bb2db30e5..47d6ab725bcc 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3613,18 +3613,18 @@ 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);
+ nr, true);
if (blk_mq_is_sbitmap_shared(set->flags)) {
hctx->sched_tags->bitmap_tags =
&q->sched_bitmap_tags;
hctx->sched_tags->breserved_tags =
&q->sched_breserved_tags;
}
+ } else {
+ ret = blk_mq_tag_update_depth(hctx, &hctx->tags, nr,
+ false);
}
if (ret)
break;
--
2.26.2
next prev parent reply other threads:[~2021-09-24 8:33 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-24 8:28 [PATCH v4 00/13] blk-mq: Reduce static requests memory footprint for shared sbitmap John Garry
2021-09-24 8:28 ` [PATCH v4 01/13] blk-mq: Change rqs check in blk_mq_free_rqs() John Garry
2021-09-24 8:28 ` [PATCH v4 02/13] block: Rename BLKDEV_MAX_RQ -> BLKDEV_DEFAULT_RQ John Garry
2021-09-24 8:28 ` [PATCH v4 03/13] blk-mq: Relocate shared sbitmap resize in blk_mq_update_nr_requests() John Garry
2021-09-24 8:28 ` John Garry [this message]
2021-09-24 8:28 ` [PATCH v4 05/13] blk-mq-sched: Rename blk_mq_sched_alloc_{tags -> map_and_rqs}() John Garry
2021-09-24 10:08 ` Hannes Reinecke
2021-09-24 8:28 ` [PATCH v4 06/13] blk-mq-sched: Rename blk_mq_sched_free_{requests -> rqs}() John Garry
2021-09-26 1:15 ` Ming Lei
2021-09-24 8:28 ` [PATCH v4 07/13] blk-mq: Pass driver tags to blk_mq_clear_rq_mapping() John Garry
2021-09-26 1:42 ` Ming Lei
2021-09-24 8:28 ` [PATCH v4 08/13] blk-mq: Don't clear driver tags own mapping John Garry
2021-09-26 1:43 ` Ming Lei
2021-09-24 8:28 ` [PATCH v4 09/13] blk-mq: Add blk_mq_tag_update_sched_shared_sbitmap() John Garry
2021-09-24 8:28 ` [PATCH v4 10/13] blk-mq: Add blk_mq_alloc_map_and_rqs() John Garry
2021-09-26 2:00 ` Ming Lei
2021-09-24 8:28 ` [PATCH v4 11/13] blk-mq: Refactor and rename blk_mq_free_map_and_{requests->rqs}() John Garry
2021-09-26 2:05 ` Ming Lei
2021-09-27 9:02 ` John Garry
2021-09-27 9:19 ` Ming Lei
2021-09-27 9:40 ` John Garry
2021-09-24 8:28 ` [PATCH v4 12/13] blk-mq: Use shared tags for shared sbitmap support John Garry
2021-09-24 10:23 ` Hannes Reinecke
2021-09-24 10:39 ` John Garry
2021-09-29 13:36 ` John Garry
2021-09-26 3:25 ` Ming Lei
2021-09-27 9:13 ` John Garry
2021-09-27 9:26 ` Ming Lei
2021-09-27 9:41 ` John Garry
2021-09-24 8:28 ` [PATCH v4 13/13] blk-mq: Stop using pointers for blk_mq_tags bitmap tags John Garry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1632472110-244938-5-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=axboe@kernel.dk \
--cc=hare@suse.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=ming.lei@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).