Commit e2e53086 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-mq: remove the done argument to blk_execute_rq_nowait 



Let the caller set it together with the end_io_data instead of passing
a pointless argument.  Note the the target code did in fact already
set it and then just overrode it again by calling blk_execute_rq_nowait.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20220524121530.943123-4-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 32ac5a9b

block/blk-mq.c

+1 −4
Original line number Diff line number Diff line
@@ -1189,7 +1189,6 @@ static void blk_add_rq_to_plug(struct blk_plug *plug, struct request *rq) 
 * blk_execute_rq_nowait - insert a request to I/O scheduler for execution

 * @rq:		request to insert

 * @at_head:    insert request at head or tail of queue

 * @done:	I/O completion handler

 *

 * Description:

 *    Insert a fully prepared request at the back of the I/O scheduler queue
@@ -1198,13 +1197,11 @@ static void blk_add_rq_to_plug(struct blk_plug *plug, struct request *rq) 
 * Note:

 *    This function will invoke @done directly if the queue is dead.

 */

void blk_execute_rq_nowait(struct request *rq, bool at_head, rq_end_io_fn *done)

void blk_execute_rq_nowait(struct request *rq, bool at_head)

{

	WARN_ON(irqs_disabled());

	WARN_ON(!blk_rq_is_passthrough(rq));



	rq->end_io = done;



	blk_account_io_start(rq);

	if (current->plug)

		blk_add_rq_to_plug(current->plug, rq);

drivers/block/sx8.c

+2 −2
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ static int carm_array_info (struct carm_host *host, unsigned int array_idx) 
	spin_unlock_irq(&host->lock);



	DPRINTK("blk_execute_rq_nowait, tag == %u\n", rq->tag);

	blk_execute_rq_nowait(rq, true, NULL);

	blk_execute_rq_nowait(rq, true);



	return 0;
@@ -579,7 +579,7 @@ static int carm_send_special (struct carm_host *host, carm_sspc_t func) 
	crq->msg_bucket = (u32) rc;



	DPRINTK("blk_execute_rq_nowait, tag == %u\n", rq->tag);

	blk_execute_rq_nowait(rq, true, NULL);

	blk_execute_rq_nowait(rq, true);



	return 0;

}

drivers/nvme/host/core.c

+2 −1
Original line number Diff line number Diff line
@@ -1206,9 +1206,10 @@ static void nvme_keep_alive_work(struct work_struct *work) 
	nvme_init_request(rq, &ctrl->ka_cmd);



	rq->timeout = ctrl->kato * HZ;

	rq->end_io = nvme_keep_alive_end_io;

	rq->end_io_data = ctrl;

	rq->rq_flags |= RQF_QUIET;

	blk_execute_rq_nowait(rq, false, nvme_keep_alive_end_io);

	blk_execute_rq_nowait(rq, false);

}



static void nvme_start_keep_alive(struct nvme_ctrl *ctrl)

drivers/nvme/host/ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 
			blk_flags);

	if (IS_ERR(req))

		return PTR_ERR(req);

	req->end_io = nvme_uring_cmd_end_io;

	req->end_io_data = ioucmd;



	/* to free bio on completion, as req->bio will be null at that time */
@@ -461,7 +462,7 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 
	pdu->meta_buffer = nvme_to_user_ptr(d.metadata);

	pdu->meta_len = d.metadata_len;



	blk_execute_rq_nowait(req, 0, nvme_uring_cmd_end_io);

	blk_execute_rq_nowait(req, false);

	return -EIOCBQUEUED;

}

drivers/nvme/host/pci.c

+7 −3
Original line number Diff line number Diff line
@@ -1438,9 +1438,10 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) 
	}

	nvme_init_request(abort_req, &cmd);



	abort_req->end_io = abort_endio;

	abort_req->end_io_data = NULL;

	abort_req->rq_flags |= RQF_QUIET;

	blk_execute_rq_nowait(abort_req, false, abort_endio);

	blk_execute_rq_nowait(abort_req, false);



	/*

	 * The aborted req will be completed on receiving the abort req.
@@ -2485,12 +2486,15 @@ static int nvme_delete_queue(struct nvme_queue *nvmeq, u8 opcode) 
		return PTR_ERR(req);

	nvme_init_request(req, &cmd);



	if (opcode == nvme_admin_delete_cq)

		req->end_io = nvme_del_cq_end;

	else

		req->end_io = nvme_del_queue_end;

	req->end_io_data = nvmeq;



	init_completion(&nvmeq->delete_done);

	req->rq_flags |= RQF_QUIET;

	blk_execute_rq_nowait(req, false, opcode == nvme_admin_delete_cq ?

			nvme_del_cq_end : nvme_del_queue_end);

	blk_execute_rq_nowait(req, false);

	return 0;

}