6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei ming.lei@redhat.com
[ Upstream commit 1d781c0de08c0b35948ad4aaf609a4cc9995d9f6 ]
ublk_need_map_io() is more readable.
Reviewed-by: Caleb Sander Mateos csander@purestorage.com Signed-off-by: Ming Lei ming.lei@redhat.com Link: https://lore.kernel.org/r/20250327095123.179113-5-ming.lei@redhat.com Signed-off-by: Jens Axboe axboe@kernel.dk Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/block/ublk_drv.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
--- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -594,6 +594,11 @@ static inline bool ublk_support_user_cop return ubq->flags & UBLK_F_USER_COPY; }
+static inline bool ublk_need_map_io(const struct ublk_queue *ubq) +{ + return !ublk_support_user_copy(ubq); +} + static inline bool ublk_need_req_ref(const struct ublk_queue *ubq) { /* @@ -921,7 +926,7 @@ static int ublk_map_io(const struct ublk { const unsigned int rq_bytes = blk_rq_bytes(req);
- if (ublk_support_user_copy(ubq)) + if (!ublk_need_map_io(ubq)) return rq_bytes;
/* @@ -945,7 +950,7 @@ static int ublk_unmap_io(const struct ub { const unsigned int rq_bytes = blk_rq_bytes(req);
- if (ublk_support_user_copy(ubq)) + if (!ublk_need_map_io(ubq)) return rq_bytes;
if (ublk_need_unmap_req(req)) { @@ -1914,7 +1919,7 @@ static int __ublk_ch_uring_cmd(struct io if (io->flags & UBLK_IO_FLAG_OWNED_BY_SRV) goto out;
- if (!ublk_support_user_copy(ubq)) { + if (ublk_need_map_io(ubq)) { /* * FETCH_RQ has to provide IO buffer if NEED GET * DATA is not enabled @@ -1936,7 +1941,7 @@ static int __ublk_ch_uring_cmd(struct io if (!(io->flags & UBLK_IO_FLAG_OWNED_BY_SRV)) goto out;
- if (!ublk_support_user_copy(ubq)) { + if (ublk_need_map_io(ubq)) { /* * COMMIT_AND_FETCH_REQ has to provide IO buffer if * NEED GET DATA is not enabled or it is Read IO.