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

block: remove REQ_OP_SCSI_{IN,OUT} 



With the legacy IDE driver gone drivers now use either REQ_OP_DRV_*
or REQ_OP_SCSI_*, so unify the two concepts of passthrough requests
into a single one.

Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 5ec780a6

block/blk-core.c

+0 −2
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ static const char *const blk_op_name[] = { 
	REQ_OP_NAME(ZONE_APPEND),

	REQ_OP_NAME(WRITE_SAME),

	REQ_OP_NAME(WRITE_ZEROES),

	REQ_OP_NAME(SCSI_IN),

	REQ_OP_NAME(SCSI_OUT),

	REQ_OP_NAME(DRV_IN),

	REQ_OP_NAME(DRV_OUT),

};

block/bsg-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static int bsg_transport_fill_hdr(struct request *rq, struct sg_io_v4 *hdr, 
		return PTR_ERR(job->request);



	if (hdr->dout_xfer_len && hdr->din_xfer_len) {

		job->bidi_rq = blk_get_request(rq->q, REQ_OP_SCSI_IN, 0);

		job->bidi_rq = blk_get_request(rq->q, REQ_OP_DRV_IN, 0);

		if (IS_ERR(job->bidi_rq)) {

			ret = PTR_ERR(job->bidi_rq);

			goto out;

block/bsg.c

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



	rq = blk_get_request(q, hdr.dout_xfer_len ?

			REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN, 0);

			REQ_OP_DRV_OUT : REQ_OP_DRV_IN, 0);

	if (IS_ERR(rq))

		return PTR_ERR(rq);

block/scsi_ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -311,7 +311,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, 0);

	rq = blk_get_request(q, writing ? REQ_OP_DRV_OUT : REQ_OP_DRV_IN, 0);

	if (IS_ERR(rq))

		return PTR_ERR(rq);

	req = scsi_req(rq);
@@ -433,7 +433,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, 0);

	rq = blk_get_request(q, in_len ? REQ_OP_DRV_OUT : REQ_OP_DRV_IN, 0);

	if (IS_ERR(rq)) {

		err = PTR_ERR(rq);

		goto error_free_buffer;
@@ -521,7 +521,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, 0);

	rq = blk_get_request(q, REQ_OP_DRV_OUT, 0);

	if (IS_ERR(rq))

		return PTR_ERR(rq);

	rq->timeout = BLK_DEFAULT_SG_TIMEOUT;

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

			     REQ_OP_DRV_OUT : REQ_OP_DRV_IN, 0);

	if (IS_ERR(rq))

		return PTR_ERR(rq);