Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

block: sanitize blk_get_request calling conventions 



Switch everyone to blk_get_request_flags, and then rename
blk_get_request_flags to blk_get_request.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a9a14d36

block/blk-core.c

+3 −11
Original line number Diff line number Diff line
@@ -1605,12 +1605,12 @@ static struct request *blk_old_get_request(struct request_queue *q, 
}



/**

 * blk_get_request_flags - allocate a request

 * 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_flags(struct request_queue *q, unsigned int op,

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

				blk_mq_req_flags_t flags)

{

	struct request *req;
@@ -1630,14 +1630,6 @@ struct request *blk_get_request_flags(struct request_queue *q, unsigned int op, 


	return req;

}

EXPORT_SYMBOL(blk_get_request_flags);



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

				gfp_t gfp_mask)

{

	return blk_get_request_flags(q, op, gfp_mask & __GFP_DIRECT_RECLAIM ?

				     0 : BLK_MQ_REQ_NOWAIT);

}

EXPORT_SYMBOL(blk_get_request);



/**

block/bsg.c

+2 −3
Original line number Diff line number Diff line
@@ -226,8 +226,7 @@ bsg_map_hdr(struct request_queue *q, struct sg_io_v4 *hdr, fmode_t mode) 
		return ERR_PTR(ret);



	rq = blk_get_request(q, hdr->dout_xfer_len ?

			REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN,

			GFP_KERNEL);

			REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, 0);

	if (IS_ERR(rq))

		return rq;
@@ -249,7 +248,7 @@ bsg_map_hdr(struct request_queue *q, struct sg_io_v4 *hdr, fmode_t mode) 
			goto out;

		}



		next_rq = blk_get_request(q, REQ_OP_SCSI_IN, GFP_KERNEL);

		next_rq = blk_get_request(q, REQ_OP_SCSI_IN, 0);

		if (IS_ERR(next_rq)) {

			ret = PTR_ERR(next_rq);

			goto out;

block/scsi_ioctl.c

+3 −5
Original line number Diff line number Diff line
@@ -321,8 +321,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, 
		at_head = 1;



	ret = -ENOMEM;

	rq = blk_get_request(q, writing ? REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN,

			GFP_KERNEL);

	rq = blk_get_request(q, writing ? REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, 0);

	if (IS_ERR(rq))

		return PTR_ERR(rq);

	req = scsi_req(rq);
@@ -449,8 +448,7 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 


	}



	rq = blk_get_request(q, in_len ? REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN,

			__GFP_RECLAIM);

	rq = blk_get_request(q, in_len ? REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, 0);

	if (IS_ERR(rq)) {

		err = PTR_ERR(rq);

		goto error_free_buffer;
@@ -538,7 +536,7 @@ static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk, 
	struct request *rq;

	int err;



	rq = blk_get_request(q, REQ_OP_SCSI_OUT, __GFP_RECLAIM);

	rq = blk_get_request(q, REQ_OP_SCSI_OUT, 0);

	if (IS_ERR(rq))

		return PTR_ERR(rq);

	rq->timeout = BLK_DEFAULT_SG_TIMEOUT;

drivers/block/paride/pd.c

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ static int pd_special_command(struct pd_unit *disk, 
{

	struct request *rq;



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

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

	if (IS_ERR(rq))

		return PTR_ERR(rq);

drivers/block/pktcdvd.c

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * 
	int ret = 0;



	rq = blk_get_request(q, (cgc->data_direction == CGC_DATA_WRITE) ?

			     REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, __GFP_RECLAIM);

			     REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, 0);

	if (IS_ERR(rq))

		return PTR_ERR(rq);