From: Chaitanya Kulkarni <kch@nvidia.com>
To: <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <axboe@kernel.dk>, <kch@nvidia.com>,
<damien.lemoal@opensource.wdc.com>, <johannes.thumshirn@wdc.com>,
<bvanassche@acm.org>, <ming.lei@redhat.com>,
<shinichiro.kawasaki@wdc.com>, <vincent.fu@samsung.com>,
<yukuai3@huawei.com>
Subject: [PATCH 4/6] null_blk: initialize cmd->bio in __alloc_cmd()
Date: Tue, 4 Oct 2022 20:16:59 -0700 [thread overview]
Message-ID: <20221005031701.79077-5-kch@nvidia.com> (raw)
In-Reply-To: <20221005031701.79077-1-kch@nvidia.com>
The function __alloc_cmd() is responsible to allocate tag and
initializae the different members of the null_cmd structure e.g.
cmd->tag, cmd->error, and cmd->nq, Move only member bio that is initialized
from alloc_cmd() into __alloc_cmd().
Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
---
drivers/block/null_blk/main.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c
index b82c2ffeb086..765c1ca0edf5 100644
--- a/drivers/block/null_blk/main.c
+++ b/drivers/block/null_blk/main.c
@@ -743,7 +743,7 @@ static void free_cmd(struct nullb_cmd *cmd)
static enum hrtimer_restart null_cmd_timer_expired(struct hrtimer *timer);
-static struct nullb_cmd *__alloc_cmd(struct nullb_queue *nq)
+static struct nullb_cmd *__alloc_cmd(struct nullb_queue *nq, struct bio *bio)
{
struct nullb_cmd *cmd;
unsigned int tag;
@@ -754,6 +754,7 @@ static struct nullb_cmd *__alloc_cmd(struct nullb_queue *nq)
cmd->tag = tag;
cmd->error = BLK_STS_OK;
cmd->nq = nq;
+ cmd->bio = bio;
if (nq->dev->irqmode == NULL_IRQ_TIMER) {
hrtimer_init(&cmd->timer, CLOCK_MONOTONIC,
HRTIMER_MODE_REL);
@@ -775,11 +776,9 @@ static struct nullb_cmd *alloc_cmd(struct nullb_queue *nq, struct bio *bio)
* This avoids multiple return statements, multiple calls to
* __alloc_cmd() and a fast path call to prepare_to_wait().
*/
- cmd = __alloc_cmd(nq);
- if (cmd) {
- cmd->bio = bio;
+ cmd = __alloc_cmd(nq, bio);
+ if (cmd)
return cmd;
- }
prepare_to_wait(&nq->wait, &wait, TASK_UNINTERRUPTIBLE);
io_schedule();
finish_wait(&nq->wait, &wait);
--
2.29.0
next prev parent reply other threads:[~2022-10-05 3:18 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-05 3:16 [PATCH 0/6] null_blk: allow REQ_OP_WRITE_ZEROES and cleanup Chaitanya Kulkarni
2022-10-05 3:16 ` [PATCH 1/6] null_blk: allow write zeores on non-membacked Chaitanya Kulkarni
2022-10-05 4:54 ` Damien Le Moal
2022-10-05 5:24 ` Chaitanya Kulkarni
2022-10-05 18:33 ` Chaitanya Kulkarni
2022-10-05 3:16 ` [PATCH 2/6] null_blk: allow write zeores on membacked Chaitanya Kulkarni
2022-10-05 4:57 ` Damien Le Moal
2022-10-05 5:10 ` Chaitanya Kulkarni
2022-10-05 17:18 ` Brian Foster
2022-10-05 18:45 ` Chaitanya Kulkarni
2022-10-05 18:53 ` Brian Foster
2022-10-05 19:01 ` Chaitanya Kulkarni
2022-10-05 3:16 ` [PATCH 3/6] null_blk: code cleaup Chaitanya Kulkarni
2022-10-05 5:02 ` Damien Le Moal
2022-10-05 5:21 ` Chaitanya Kulkarni
2022-10-05 3:16 ` Chaitanya Kulkarni [this message]
2022-10-05 5:04 ` [PATCH 4/6] null_blk: initialize cmd->bio in __alloc_cmd() Damien Le Moal
2022-10-05 3:17 ` [PATCH 5/6] null_blk: don't use magic numbers in the code Chaitanya Kulkarni
2022-10-05 5:05 ` Damien Le Moal
2022-10-05 3:17 ` [PATCH 6/6] null_blk: remove extra space in switch condition Chaitanya Kulkarni
2022-10-05 5:06 ` Damien Le Moal
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=20221005031701.79077-5-kch@nvidia.com \
--to=kch@nvidia.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=damien.lemoal@opensource.wdc.com \
--cc=johannes.thumshirn@wdc.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ming.lei@redhat.com \
--cc=shinichiro.kawasaki@wdc.com \
--cc=vincent.fu@samsung.com \
--cc=yukuai3@huawei.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).