From: Kemeng Shi <shikemeng@huawei.com>
To: <paolo.valente@linaro.org>, <axboe@kernel.dk>
Cc: <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<shikemeng@huawei.com>
Subject: [PATCH 08/10] block, bfq: remove unnecessary goto tag in bfq_dispatch_rq_from_bfqq
Date: Tue, 8 Nov 2022 12:52:22 +0800 [thread overview]
Message-ID: <20221108045224.19092-9-shikemeng@huawei.com> (raw)
In-Reply-To: <20221108045224.19092-1-shikemeng@huawei.com>
We jump to tag only for returning current rq. Return directly to
remove this tag.
Signed-off-by: Kemeng Shi <shikemeng@huawei.com>
---
block/bfq-iosched.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index cffc5ff66ee6..64c1249d8eda 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -5031,7 +5031,7 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd,
bfq_dispatch_remove(bfqd->queue, rq);
if (bfqq != bfqd->in_service_queue)
- goto return_rq;
+ return rq;
/*
* If weight raising has to terminate for bfqq, then next
@@ -5051,12 +5051,9 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd,
* belongs to CLASS_IDLE and other queues are waiting for
* service.
*/
- if (!(bfq_tot_busy_queues(bfqd) > 1 && bfq_class_idle(bfqq)))
- goto return_rq;
+ if ((bfq_tot_busy_queues(bfqd) > 1 && bfq_class_idle(bfqq)))
+ bfq_bfqq_expire(bfqd, bfqq, false, BFQQE_BUDGET_EXHAUSTED);
- bfq_bfqq_expire(bfqd, bfqq, false, BFQQE_BUDGET_EXHAUSTED);
-
-return_rq:
return rq;
}
--
2.30.0
next prev parent reply other threads:[~2022-11-08 4:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-08 4:52 [PATCH 00/10] A few bugfix and cleancode patch for bfq Kemeng Shi
2022-11-08 4:52 ` [PATCH 01/10] block, bfq: correctly raise inject limit in bfq_choose_bfqq_for_injection Kemeng Shi
2022-11-08 4:52 ` [PATCH 02/10] block, bfq: remove unsed parameter reason in bfq_bfqq_is_slow Kemeng Shi
2022-11-08 4:52 ` [PATCH 03/10] block, bfq: initialize bfqq->decrease_time_jif correctly Kemeng Shi
2022-11-08 4:52 ` [PATCH 04/10] block, bfq: use helper macro RQ_BFQQ to get bfqq of request Kemeng Shi
2022-11-08 4:52 ` [PATCH 05/10] block, bfq: remove unnecessary pointer reference to get async_bfqq Kemeng Shi
2022-11-08 4:52 ` [PATCH 06/10] block, bfq: remove redundant bfqd->rq_in_driver > 0 check in bfq_add_request Kemeng Shi
2022-11-08 4:52 ` [PATCH 07/10] block, bfq: remove redundant check in bfq_put_cooperator Kemeng Shi
2022-11-08 4:52 ` Kemeng Shi [this message]
2022-11-08 4:52 ` [PATCH 09/10] block, bfq: remove unused bfq_wr_max_time in struct bfq_data Kemeng Shi
2022-11-08 4:52 ` [PATCH 10/10] block, bfq: remove check of bfq_wr_max_softrt_rate which is always greater than 0 Kemeng Shi
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=20221108045224.19092-9-shikemeng@huawei.com \
--to=shikemeng@huawei.com \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=paolo.valente@linaro.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.