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

Commit f27b087b authored by Jens Axboe's avatar Jens Axboe
Browse files

block: add blk_rq_set_block_pc() 



With the optimizations around not clearing the full request at alloc
time, we are leaving some of the needed init for REQ_TYPE_BLOCK_PC
up to the user allocating the request.

Add a blk_rq_set_block_pc() that sets the command type to
REQ_TYPE_BLOCK_PC, and properly initializes the members associated
with this type of request. Update callers to use this function instead
of manipulating rq->cmd_type directly.

Includes fixes from Christoph Hellwig <hch@lst.de> for my half-assed
attempt.

Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 762380ad

block/blk-core.c

+18 −0
Original line number Diff line number Diff line
@@ -1218,6 +1218,8 @@ struct request *blk_make_request(struct request_queue *q, struct bio *bio, 
	if (unlikely(!rq))

		return ERR_PTR(-ENOMEM);



	blk_rq_set_block_pc(rq);



	for_each_bio(bio) {

		struct bio *bounce_bio = bio;

		int ret;
@@ -1234,6 +1236,22 @@ struct request *blk_make_request(struct request_queue *q, struct bio *bio, 
}

EXPORT_SYMBOL(blk_make_request);



/**

 * blk_rq_set_block_pc - initialize a requeest to type BLOCK_PC

 * @rq:		request to be initialized

 *

 */

void blk_rq_set_block_pc(struct request *rq)

{

	rq->cmd_type = REQ_TYPE_BLOCK_PC;

	rq->__data_len = 0;

	rq->__sector = (sector_t) -1;

	rq->bio = rq->biotail = NULL;

	memset(rq->__cmd, 0, sizeof(rq->__cmd));

	rq->cmd = rq->__cmd;

}

EXPORT_SYMBOL(blk_rq_set_block_pc);



/**

 * blk_requeue_request - put a request back on queue

 * @q:		request queue where request should be inserted

block/bsg.c

+2 −1
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, 
	 * fill in request structure

	 */

	rq->cmd_len = hdr->request_len;

	rq->cmd_type = REQ_TYPE_BLOCK_PC;



	rq->timeout = msecs_to_jiffies(hdr->timeout);

	if (!rq->timeout)
@@ -273,6 +272,8 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm, 
	rq = blk_get_request(q, rw, GFP_KERNEL);

	if (!rq)

		return ERR_PTR(-ENOMEM);

	blk_rq_set_block_pc(rq);



	ret = blk_fill_sgv4_hdr_rq(q, rq, hdr, bd, has_write_perm);

	if (ret)

		goto out;

block/scsi_ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -229,7 +229,6 @@ static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, 
	 * fill in request structure

	 */

	rq->cmd_len = hdr->cmd_len;

	rq->cmd_type = REQ_TYPE_BLOCK_PC;



	rq->timeout = msecs_to_jiffies(hdr->timeout);

	if (!rq->timeout)
@@ -311,6 +310,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, 
	rq = blk_get_request(q, writing ? WRITE : READ, GFP_KERNEL);

	if (!rq)

		return -ENOMEM;

	blk_rq_set_block_pc(rq);



	if (blk_fill_sghdr_rq(q, rq, hdr, mode)) {

		blk_put_request(rq);
@@ -491,7 +491,7 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode, 
	memset(sense, 0, sizeof(sense));

	rq->sense = sense;

	rq->sense_len = 0;

	rq->cmd_type = REQ_TYPE_BLOCK_PC;

	blk_rq_set_block_pc(rq);



	blk_execute_rq(q, disk, rq, 0);
@@ -524,7 +524,7 @@ static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk, 
	int err;



	rq = blk_get_request(q, WRITE, __GFP_WAIT);

	rq->cmd_type = REQ_TYPE_BLOCK_PC;

	blk_rq_set_block_pc(rq);

	rq->timeout = BLK_DEFAULT_SG_TIMEOUT;

	rq->cmd[0] = cmd;

	rq->cmd[4] = data;

drivers/block/pktcdvd.c

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


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

			     WRITE : READ, __GFP_WAIT);

	blk_rq_set_block_pc(rq);



	if (cgc->buflen) {

		ret = blk_rq_map_kern(q, rq, cgc->buffer, cgc->buflen,
@@ -716,7 +717,6 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * 
	memcpy(rq->cmd, cgc->cmd, CDROM_PACKET_SIZE);



	rq->timeout = 60*HZ;

	rq->cmd_type = REQ_TYPE_BLOCK_PC;

	if (cgc->quiet)

		rq->cmd_flags |= REQ_QUIET;

drivers/cdrom/cdrom.c

+1 −1
Original line number Diff line number Diff line
@@ -2184,6 +2184,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, 
			ret = -ENOMEM;

			break;

		}

		blk_rq_set_block_pc(rq);



		ret = blk_rq_map_user(q, rq, NULL, ubuf, len, GFP_KERNEL);

		if (ret) {
@@ -2203,7 +2204,6 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, 
		rq->cmd[9] = 0xf8;



		rq->cmd_len = 12;

		rq->cmd_type = REQ_TYPE_BLOCK_PC;

		rq->timeout = 60 * HZ;

		bio = rq->bio;