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

block: remove blk_{get,put}_request 



These are now pointless wrappers around blk_mq_{alloc,free}_request,
so remove them.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20211025070517.1548584-3-hch@lst.de


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

block/blk-core.c

+0 −21
Original line number Diff line number Diff line
@@ -597,27 +597,6 @@ bool blk_get_queue(struct request_queue *q) 
}

EXPORT_SYMBOL(blk_get_queue);



/**

 * blk_get_request - allocate a request

 * @q: request queue to allocate a request for

 * @op: operation (REQ_OP_*) and REQ_* flags, e.g. REQ_SYNC.

 * @flags: BLK_MQ_REQ_* flags, e.g. BLK_MQ_REQ_NOWAIT.

 */

struct request *blk_get_request(struct request_queue *q, unsigned int op,

				blk_mq_req_flags_t flags)

{

	WARN_ON_ONCE(op & REQ_NOWAIT);

	WARN_ON_ONCE(flags & ~(BLK_MQ_REQ_NOWAIT | BLK_MQ_REQ_PM));

	return blk_mq_alloc_request(q, op, flags);

}

EXPORT_SYMBOL(blk_get_request);



void blk_put_request(struct request *req)

{

	blk_mq_free_request(req);

}

EXPORT_SYMBOL(blk_put_request);



static void handle_bad_sector(struct bio *bio, sector_t maxsector)

{

	char b[BDEVNAME_SIZE];

drivers/block/paride/pd.c

+2 −2
Original line number Diff line number Diff line
@@ -775,14 +775,14 @@ static int pd_special_command(struct pd_unit *disk, 
	struct request *rq;

	struct pd_req *req;



	rq = blk_get_request(disk->gd->queue, REQ_OP_DRV_IN, 0);

	rq = blk_mq_alloc_request(disk->gd->queue, REQ_OP_DRV_IN, 0);

	if (IS_ERR(rq))

		return PTR_ERR(rq);

	req = blk_mq_rq_to_pdu(rq);



	req->func = func;

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

	blk_put_request(rq);

	blk_mq_free_request(rq);

	return 0;

}

drivers/block/pktcdvd.c

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * 
	if (scsi_req(rq)->result)

		ret = -EIO;

out:

	blk_put_request(rq);

	blk_mq_free_request(rq);

	return ret;

}

drivers/block/virtio_blk.c

+2 −2
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static int virtblk_get_id(struct gendisk *disk, char *id_str) 
	struct request *req;

	int err;



	req = blk_get_request(q, REQ_OP_DRV_IN, 0);

	req = blk_mq_alloc_request(q, REQ_OP_DRV_IN, 0);

	if (IS_ERR(req))

		return PTR_ERR(req);
@@ -323,7 +323,7 @@ static int virtblk_get_id(struct gendisk *disk, char *id_str) 
	blk_execute_rq(vblk->disk, req, false);

	err = blk_status_to_errno(virtblk_result(blk_mq_rq_to_pdu(req)));

out:

	blk_put_request(req);

	blk_mq_free_request(req);

	return err;

}

drivers/md/dm-mpath.c

+2 −2
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ static int multipath_clone_and_map(struct dm_target *ti, struct request *rq, 


	bdev = pgpath->path.dev->bdev;

	q = bdev_get_queue(bdev);

	clone = blk_get_request(q, rq->cmd_flags | REQ_NOMERGE,

	clone = blk_mq_alloc_request(q, rq->cmd_flags | REQ_NOMERGE,

			BLK_MQ_REQ_NOWAIT);

	if (IS_ERR(clone)) {

		/* EBUSY, ENODEV or EWOULDBLOCK: requeue */
@@ -579,7 +579,7 @@ static void multipath_release_clone(struct request *clone, 
						    clone->io_start_time_ns);

	}



	blk_put_request(clone);

	blk_mq_free_request(clone);

}



/*