@@ -1183,11 +1183,10 @@ static inline void __ublk_abort_rq(struct ublk_queue *ubq,
else
blk_mq_end_request(rq, BLK_STS_IOERR);
}
static void ublk_dispatch_req(struct ublk_queue *ubq,
- struct io_uring_cmd *cmd,
struct request *req,
unsigned int issue_flags)
{
int tag = req->tag;
struct ublk_io *io = &ubq->ios[tag];
@@ -1271,11 +1270,11 @@ static void ublk_cmd_tw_cb(struct io_uring_cmd *cmd,
struct ublk_queue *ubq = pdu->ubq;
int tag = pdu->tag;
struct request *req = blk_mq_tag_to_rq(
ubq->dev->tag_set.tags[ubq->q_id], tag);
- ublk_dispatch_req(ubq, cmd, req, issue_flags);
+ ublk_dispatch_req(ubq, req, issue_flags);
}
static void ublk_queue_cmd(struct ublk_queue *ubq, struct request *rq)
{
struct ublk_io *io = &ubq->ios[rq->tag];
@@ -1290,15 +1289,13 @@ static void ublk_cmd_list_tw_cb(struct io_uring_cmd *cmd,
struct request *rq = pdu->req_list;
struct ublk_queue *ubq = rq->mq_hctx->driver_data;
struct request *next;
while (rq) {
- struct ublk_io *io = &ubq->ios[rq->tag];
-
next = rq->rq_next;
rq->rq_next = NULL;
- ublk_dispatch_req(ubq, io->cmd, rq, issue_flags);
+ ublk_dispatch_req(ubq, rq, issue_flags);
rq = next;
}
}
static void ublk_queue_cmd_list(struct ublk_queue *ubq, struct rq_list *l)
ublk_dispatch_req() never uses its struct io_uring_cmd *cmd argument. Drop it so callers don't have to pass a value. Signed-off-by: Caleb Sander Mateos <csander@purestorage.com> --- drivers/block/ublk_drv.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)