From: Caleb Sander Mateos Date: Wed, 30 Apr 2025 22:52:28 +0000 (-0600) Subject: ublk: remove misleading "ubq" in "ubq_complete_io_cmd()" X-Git-Tag: v6.16-rc1~216^2~120 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a43d93588dca88af0333ce18dedcfb0276ec4fe;p=thirdparty%2Fkernel%2Flinux.git ublk: remove misleading "ubq" in "ubq_complete_io_cmd()" ubq_complete_io_cmd() doesn't interact with a ublk queue, so "ubq" in the name is confusing. Most likely "ubq" was meant to be "ublk". Signed-off-by: Caleb Sander Mateos Reviewed-by: Ming Lei Link: https://lore.kernel.org/r/20250430225234.2676781-4-csander@purestorage.com Signed-off-by: Jens Axboe --- diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 44ba6c9d89296..4967a5d720292 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1125,8 +1125,8 @@ static void ublk_complete_rq(struct kref *ref) __ublk_complete_rq(req); } -static void ubq_complete_io_cmd(struct ublk_io *io, int res, - unsigned issue_flags) +static void ublk_complete_io_cmd(struct ublk_io *io, int res, + unsigned issue_flags) { /* mark this cmd owned by ublksrv */ io->flags |= UBLK_IO_FLAG_OWNED_BY_SRV; @@ -1190,7 +1190,8 @@ static void ublk_dispatch_req(struct ublk_queue *ubq, pr_devel("%s: need get data. op %d, qid %d tag %d io_flags %x\n", __func__, io->cmd->cmd_op, ubq->q_id, req->tag, io->flags); - ubq_complete_io_cmd(io, UBLK_IO_RES_NEED_GET_DATA, issue_flags); + ublk_complete_io_cmd(io, UBLK_IO_RES_NEED_GET_DATA, + issue_flags); return; } /* @@ -1229,7 +1230,7 @@ static void ublk_dispatch_req(struct ublk_queue *ubq, } ublk_init_req_ref(ubq, req); - ubq_complete_io_cmd(io, UBLK_IO_RES_OK, issue_flags); + ublk_complete_io_cmd(io, UBLK_IO_RES_OK, issue_flags); } static void ublk_cmd_tw_cb(struct io_uring_cmd *cmd,