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

block: remove the gendisk argument to blk_execute_rq 



Remove the gendisk aregument to blk_execute_rq and blk_execute_rq_nowait
given that it is unused now.  Also convert the boolean at_head parameter
to actually use the bool type while touching the prototype.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20211126121802.2090656-5-hch@lst.de


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

block/blk-mq.c

+3 −7
Original line number Diff line number Diff line
@@ -1153,7 +1153,6 @@ static void blk_end_sync_rq(struct request *rq, blk_status_t error) 


/**

 * 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

 * @done:	I/O completion handler
@@ -1165,8 +1164,7 @@ 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 gendisk *bd_disk, struct request *rq,

			   int at_head, rq_end_io_fn *done)

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

{

	WARN_ON(irqs_disabled());

	WARN_ON(!blk_rq_is_passthrough(rq));
@@ -1204,7 +1202,6 @@ static void blk_rq_poll_completion(struct request *rq, struct completion *wait) 


/**

 * blk_execute_rq - insert a request into queue for execution

 * @bd_disk:	matching gendisk

 * @rq:		request to insert

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

 *
@@ -1213,14 +1210,13 @@ static void blk_rq_poll_completion(struct request *rq, struct completion *wait) 
 *    for execution and wait for completion.

 * Return: The blk_status_t result provided to blk_mq_end_request().

 */

blk_status_t blk_execute_rq(struct gendisk *bd_disk, struct request *rq,

		int at_head)

blk_status_t blk_execute_rq(struct request *rq, bool at_head)

{

	DECLARE_COMPLETION_ONSTACK(wait);

	unsigned long hang_check;



	rq->end_io_data = &wait;

	blk_execute_rq_nowait(bd_disk, rq, at_head, blk_end_sync_rq);

	blk_execute_rq_nowait(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;

block/bsg-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int bsg_transport_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr, 
		goto out_unmap_bidi_rq;



	bio = rq->bio;

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

	blk_execute_rq(rq, !(hdr->flags & BSG_FLAG_Q_AT_TAIL));



	/*

	 * The assignments below don't make much sense, but are kept for

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(NULL, rq, true);

	blk_execute_rq(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, rq, 0);

	blk_execute_rq(rq, false);

	blk_mq_free_request(rq);

	return 0;

}

drivers/block/pktcdvd.c

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * 
	if (cgc->quiet)

		rq->rq_flags |= RQF_QUIET;



	blk_execute_rq(pd->bdev->bd_disk, rq, 0);

	blk_execute_rq(rq, false);

	if (scsi_req(rq)->result)

		ret = -EIO;

out: