Commit 684da762 authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Jens Axboe
Browse files

block: remove unnecessary argument from blk_execute_rq 



We can remove 'q' from blk_execute_rq as well after the previous change
in blk_execute_rq_nowait.

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

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
Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # for mmc
Signed-off-by: default avatarGuoqing Jiang <guoqing.jiang@cloud.ionos.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8eeed0b5

block/blk-exec.c

+1 −2
Original line number Diff line number Diff line
@@ -74,8 +74,7 @@ EXPORT_SYMBOL_GPL(blk_execute_rq_nowait); 
 *    Insert a fully prepared request at the back of the I/O scheduler queue

 *    for execution and wait for completion.

 */

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

		   struct request *rq, int at_head)

void blk_execute_rq(struct gendisk *bd_disk, struct request *rq, int at_head)

{

	DECLARE_COMPLETION_ONSTACK(wait);

	unsigned long hang_check;

block/bsg.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int bsg_sg_io(struct request_queue *q, fmode_t mode, void __user *uarg) 


	bio = rq->bio;



	blk_execute_rq(q, NULL, rq, !(hdr.flags & BSG_FLAG_Q_AT_TAIL));

	blk_execute_rq(NULL, rq, !(hdr.flags & BSG_FLAG_Q_AT_TAIL));

	ret = rq->q->bsg_dev.ops->complete_rq(rq, &hdr);

	blk_rq_unmap_user(bio);

block/scsi_ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, 
	 * (if he doesn't check that is his problem).

	 * N.B. a non-zero SCSI status is _not_ necessarily an error.

	 */

	blk_execute_rq(q, bd_disk, rq, at_head);

	blk_execute_rq(bd_disk, rq, at_head);



	hdr->duration = jiffies_to_msecs(jiffies - start_time);
@@ -493,7 +493,7 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 
		goto error;

	}



	blk_execute_rq(q, disk, rq, 0);

	blk_execute_rq(disk, rq, 0);



	err = req->result & 0xff;	/* only 8 bit SCSI status */

	if (err) {
@@ -532,7 +532,7 @@ static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk, 
	scsi_req(rq)->cmd[0] = cmd;

	scsi_req(rq)->cmd[4] = data;

	scsi_req(rq)->cmd_len = 6;

	blk_execute_rq(q, bd_disk, rq, 0);

	blk_execute_rq(bd_disk, rq, 0);

	err = scsi_req(rq)->result ? -EIO : 0;

	blk_put_request(rq);

drivers/block/mtip32xx/mtip32xx.c

+1 −1
Original line number Diff line number Diff line
@@ -1015,7 +1015,7 @@ static int mtip_exec_internal_command(struct mtip_port *port, 
	rq->timeout = timeout;



	/* insert request and run queue */

	blk_execute_rq(rq->q, NULL, rq, true);

	blk_execute_rq(NULL, rq, true);



	if (int_cmd->status) {

		dev_err(&dd->pdev->dev, "Internal command [%02X] failed %d\n",

drivers/block/paride/pd.c

+1 −1
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ static int pd_special_command(struct pd_unit *disk, 
	req = blk_mq_rq_to_pdu(rq);



	req->func = func;

	blk_execute_rq(disk->gd->queue, disk->gd, rq, 0);

	blk_execute_rq(disk->gd, rq, 0);

	blk_put_request(rq);

	return 0;

}