From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
To: linux-block@vger.kernel.org
Cc: hch@lst.de, axboe@kernel.dk,
Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Subject: [PATCH V4 4/6] null_blk: create a helper for mem-backed ops
Date: Thu, 22 Aug 2019 21:45:17 -0700 [thread overview]
Message-ID: <20190823044519.3939-5-chaitanya.kulkarni@wdc.com> (raw)
In-Reply-To: <20190823044519.3939-1-chaitanya.kulkarni@wdc.com>
This patch creates a helper for handling requests when null_blk is
memory backed in the null_handle_cmd(). Although the helper is very
simple right now, it makes the code flow consistent with the rest of
code in the null_handle_cmd() and provides a uniform code structure
for future code.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
drivers/block/null_blk_main.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c
index eefaea1aaa45..4299274cccfb 100644
--- a/drivers/block/null_blk_main.c
+++ b/drivers/block/null_blk_main.c
@@ -1168,13 +1168,26 @@ static inline blk_status_t null_handle_badblocks(struct nullb_cmd *cmd,
return BLK_STS_OK;
}
+static inline blk_status_t null_handle_memory_backed(struct nullb_cmd *cmd,
+ enum req_opf op)
+{
+ struct nullb_device *dev = cmd->nq->dev;
+ int err;
+
+ if (dev->queue_mode == NULL_Q_BIO)
+ err = null_handle_bio(cmd);
+ else
+ err = null_handle_rq(cmd);
+
+ return errno_to_blk_status(err);
+}
+
static blk_status_t null_handle_cmd(struct nullb_cmd *cmd, sector_t sector,
sector_t nr_sectors, enum req_opf op)
{
struct nullb_device *dev = cmd->nq->dev;
struct nullb *nullb = dev->nullb;
blk_status_t sts;
- int err = 0;
if (test_bit(NULLB_DEV_FL_THROTTLED, &dev->flags)) {
sts = null_handle_throttled(cmd);
@@ -1193,14 +1206,8 @@ static blk_status_t null_handle_cmd(struct nullb_cmd *cmd, sector_t sector,
goto out;
}
- if (dev->memory_backed) {
- if (dev->queue_mode == NULL_Q_BIO)
- err = null_handle_bio(cmd);
- else
- err = null_handle_rq(cmd);
- }
-
- cmd->error = errno_to_blk_status(err);
+ if (dev->memory_backed)
+ cmd->error = null_handle_memory_backed(cmd, op);
if (!cmd->error && dev->zoned) {
if (op == REQ_OP_WRITE)
--
2.17.0
next prev parent reply other threads:[~2019-08-23 4:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-23 4:45 [PATCH V4 0/6] null_blk: simplify null_handle_cmd() Chaitanya Kulkarni
2019-08-23 4:45 ` [PATCH V4 1/6] null_blk: move duplicate code to callers Chaitanya Kulkarni
2019-08-23 4:45 ` [PATCH V4 2/6] null_blk: create a helper for throttling Chaitanya Kulkarni
2019-08-23 4:45 ` [PATCH V4 3/6] null_blk: create a helper for badblocks Chaitanya Kulkarni
2019-08-23 4:45 ` Chaitanya Kulkarni [this message]
2019-08-23 4:45 ` [PATCH V4 5/6] null_blk: create a helper for zoned devices Chaitanya Kulkarni
2019-08-23 4:45 ` [PATCH V4 6/6] null_blk: create a helper for req completion Chaitanya Kulkarni
2019-08-23 12:58 ` [PATCH V4 0/6] null_blk: simplify null_handle_cmd() Jens Axboe
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=20190823044519.3939-5-chaitanya.kulkarni@wdc.com \
--to=chaitanya.kulkarni@wdc.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.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 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).