Commit 8eeed0b5 authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Jens Axboe
Browse files

block: remove unnecessary argument from blk_execute_rq_nowait 



The 'q' is not used since commit a1ce35fa ("block: remove dead
elevator code"), also update the comment of the function.

And more importantly it never really was needed to start with given
that we can trivial derive it from struct request.

Cc: target-devel@vger.kernel.org
Cc: linux-scsi@vger.kernel.org
Cc: virtualization@lists.linux-foundation.org
Cc: linux-ide@vger.kernel.org
Cc: linux-mmc@vger.kernel.org
Cc: linux-nvme@lists.infradead.org
Cc: linux-nfs@vger.kernel.org
Signed-off-by: default avatarGuoqing Jiang <guoqing.jiang@cloud.ionos.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0f7b4bc6

block/blk-exec.c

+4 −6
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ static void blk_end_sync_rq(struct request *rq, blk_status_t error) 
}



/**

 * blk_execute_rq_nowait - insert a request into queue for execution

 * @q:		queue to insert the request in

 * blk_execute_rq_nowait - insert a request to I/O scheduler for execution

 * @bd_disk:	matching gendisk

 * @rq:		request to insert

 * @at_head:    insert request at head or tail of queue
@@ -45,9 +44,8 @@ static void blk_end_sync_rq(struct request *rq, blk_status_t error) 
 * Note:

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

 */

void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,

			   struct request *rq, int at_head,

			   rq_end_io_fn *done)

void blk_execute_rq_nowait(struct gendisk *bd_disk, struct request *rq,

			   int at_head, rq_end_io_fn *done)

{

	WARN_ON(irqs_disabled());

	WARN_ON(!blk_rq_is_passthrough(rq));
@@ -83,7 +81,7 @@ void blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk, 
	unsigned long hang_check;



	rq->end_io_data = &wait;

	blk_execute_rq_nowait(q, bd_disk, rq, at_head, blk_end_sync_rq);

	blk_execute_rq_nowait(bd_disk, rq, at_head, blk_end_sync_rq);



	/* Prevent hang_check timer from firing at us during very long I/O */

	hang_check = sysctl_hung_task_timeout_secs;

drivers/block/sx8.c

+2 −2
Original line number Diff line number Diff line
@@ -539,7 +539,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(host->oob_q, NULL, rq, true, NULL);

	blk_execute_rq_nowait(NULL, rq, true, NULL);



	return 0;
@@ -578,7 +578,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(host->oob_q, NULL, rq, true, NULL);

	blk_execute_rq_nowait(NULL, rq, true, NULL);



	return 0;

}

drivers/nvme/host/core.c

+2 −2
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ static void nvme_execute_rq_polled(struct request_queue *q, 


	rq->cmd_flags |= REQ_HIPRI;

	rq->end_io_data = &wait;

	blk_execute_rq_nowait(q, bd_disk, rq, at_head, nvme_end_sync_rq);

	blk_execute_rq_nowait(bd_disk, rq, at_head, nvme_end_sync_rq);



	while (!completion_done(&wait)) {

		blk_poll(q, request_to_qc_t(rq->mq_hctx, rq), true);
@@ -1202,7 +1202,7 @@ static int nvme_keep_alive(struct nvme_ctrl *ctrl) 
	rq->timeout = ctrl->kato * HZ;

	rq->end_io_data = ctrl;



	blk_execute_rq_nowait(rq->q, NULL, rq, 0, nvme_keep_alive_end_io);

	blk_execute_rq_nowait(NULL, rq, 0, nvme_keep_alive_end_io);



	return 0;

}

drivers/nvme/host/lightnvm.c

+1 −1
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ static int nvme_nvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd, 


	rq->end_io_data = rqd;



	blk_execute_rq_nowait(q, NULL, rq, 0, nvme_nvm_end_io);

	blk_execute_rq_nowait(NULL, rq, 0, nvme_nvm_end_io);



	return 0;

drivers/nvme/host/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -1357,7 +1357,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) 
	}



	abort_req->end_io_data = NULL;

	blk_execute_rq_nowait(abort_req->q, NULL, abort_req, 0, abort_endio);

	blk_execute_rq_nowait(NULL, abort_req, 0, abort_endio);



	/*

	 * The aborted req will be completed on receiving the abort req.
@@ -2281,7 +2281,7 @@ static int nvme_delete_queue(struct nvme_queue *nvmeq, u8 opcode) 
	req->end_io_data = nvmeq;



	init_completion(&nvmeq->delete_done);

	blk_execute_rq_nowait(q, NULL, req, false,

	blk_execute_rq_nowait(NULL, req, false,

			opcode == nvme_admin_delete_cq ?

				nvme_del_cq_end : nvme_del_queue_end);

	return 0;