From: Uday Shankar <ushankar@purestorage.com>
To: Ming Lei <ming.lei@redhat.com>, Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
Uday Shankar <ushankar@purestorage.com>
Subject: [PATCH 4/4] ublk: factor out error handling in __ublk_ch_uring_cmd
Date: Mon, 21 Apr 2025 17:46:43 -0600 [thread overview]
Message-ID: <20250421-ublk_constify-v1-4-3371f9e9f73c@purestorage.com> (raw)
In-Reply-To: <20250421-ublk_constify-v1-0-3371f9e9f73c@purestorage.com>
There is a tiny bit of error handling code in __ublk_ch_uring_cmd which
is repeated thrice. Factor it out of the switch statement.
Signed-off-by: Uday Shankar <ushankar@purestorage.com>
---
drivers/block/ublk_drv.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index f5d4593d5941931efa7bc7d2106830cd2981f4bd..31ebfdf52a8986e879c136ea546755a2fbe15315 100644
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -2095,22 +2095,18 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd,
return ublk_unregister_io_buf(cmd, ub_cmd->addr, issue_flags);
case UBLK_IO_FETCH_REQ:
ret = ublk_fetch(cmd, ubq, io, ub_cmd->addr);
- if (ret)
- goto out;
break;
case UBLK_IO_COMMIT_AND_FETCH_REQ:
ret = ublk_commit_and_fetch(ubq, io, cmd, ub_cmd);
- if (ret)
- goto out;
break;
case UBLK_IO_NEED_GET_DATA:
ret = ublk_get_data(ubq, io, cmd, ub_cmd);
- if (ret)
- goto out;
break;
default:
goto out;
}
+ if (ret)
+ goto out;
ublk_prep_cancel(cmd, issue_flags, ubq, tag);
return -EIOCBQUEUED;
--
2.34.1
next prev parent reply other threads:[~2025-04-21 23:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-21 23:46 [PATCH 0/4] ublk: refactor __ublk_ch_uring_cmd Uday Shankar
2025-04-21 23:46 ` [PATCH 1/4] ublk: factor out ublk_commit_and_fetch Uday Shankar
2025-04-22 2:16 ` Ming Lei
2025-04-21 23:46 ` [PATCH 2/4] ublk: mark ublk_queue as const for ublk_register_io_buf Uday Shankar
2025-04-21 23:46 ` [PATCH 3/4] ublk: factor out ublk_get_data Uday Shankar
2025-04-22 2:17 ` Ming Lei
2025-04-21 23:46 ` Uday Shankar [this message]
2025-04-22 2:17 ` [PATCH 4/4] ublk: factor out error handling in __ublk_ch_uring_cmd Ming Lei
2025-04-24 21:50 ` [PATCH 0/4] ublk: refactor __ublk_ch_uring_cmd Uday Shankar
2025-04-25 2:40 ` 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=20250421-ublk_constify-v1-4-3371f9e9f73c@purestorage.com \
--to=ushankar@purestorage.com \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@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
all inboxes | Powered by JetHome®