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

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

block: fold cmd_type into the REQ_OP_ space 



Instead of keeping two levels of indirection for requests types, fold it
all into the operations.  The little caveat here is that previously
cmd_type only applied to struct request, while the request and bio op
fields were set to plain REQ_OP_READ/WRITE even for passthrough
operations.

Instead this patch adds new REQ_OP_* for SCSI passthrough and driver
private requests, althought it has to add two for each so that we
can communicate the data in/out nature of the request.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 2f5a8e80

block/bio.c

+0 −10
Original line number Diff line number Diff line
@@ -1227,9 +1227,6 @@ struct bio *bio_copy_user_iov(struct request_queue *q, 
	if (!bio)

		goto out_bmd;



	if (iter->type & WRITE)

		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);



	ret = 0;



	if (map_data) {
@@ -1394,12 +1391,6 @@ struct bio *bio_map_user_iov(struct request_queue *q, 


	kfree(pages);



	/*

	 * set data direction, and check if mapped pages need bouncing

	 */

	if (iter->type & WRITE)

		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);



	bio_set_flag(bio, BIO_USER_MAPPED);



	/*
@@ -1590,7 +1581,6 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len, 
		bio->bi_private = data;

	} else {

		bio->bi_end_io = bio_copy_kern_endio;

		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);

	}



	return bio;

block/blk-core.c

+2 −4
Original line number Diff line number Diff line
@@ -158,8 +158,8 @@ static void req_bio_endio(struct request *rq, struct bio *bio, 


void blk_dump_rq_flags(struct request *rq, char *msg)

{

	printk(KERN_INFO "%s: dev %s: type=%x, flags=%llx\n", msg,

		rq->rq_disk ? rq->rq_disk->disk_name : "?", rq->cmd_type,

	printk(KERN_INFO "%s: dev %s: flags=%llx\n", msg,

		rq->rq_disk ? rq->rq_disk->disk_name : "?",

		(unsigned long long) rq->cmd_flags);



	printk(KERN_INFO "  sector %llu, nr/cnr %u/%u\n",
@@ -1593,7 +1593,6 @@ unsigned int blk_plug_queued_count(struct request_queue *q) 


void init_request_from_bio(struct request *req, struct bio *bio)

{

	req->cmd_type = REQ_TYPE_FS;

	if (bio->bi_opf & REQ_RAHEAD)

		req->cmd_flags |= REQ_FAILFAST_MASK;
@@ -2983,7 +2982,6 @@ EXPORT_SYMBOL_GPL(blk_rq_unprep_clone); 
static void __blk_rq_prep_clone(struct request *dst, struct request *src)

{

	dst->cpu = src->cpu;

	dst->cmd_type = src->cmd_type;

	dst->__sector = blk_rq_pos(src);

	dst->__data_len = blk_rq_bytes(src);

	dst->nr_phys_segments = src->nr_phys_segments;

block/blk-flush.c

+0 −1
Original line number Diff line number Diff line
@@ -327,7 +327,6 @@ static bool blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq) 
		blk_mq_tag_set_rq(hctx, first_rq->tag, flush_rq);

	}



	flush_rq->cmd_type = REQ_TYPE_FS;

	flush_rq->cmd_flags = REQ_OP_FLUSH | REQ_PREFLUSH;

	flush_rq->rq_flags |= RQF_FLUSH_SEQ;

	flush_rq->rq_disk = first_rq->rq_disk;

block/blk-map.c

+7 −6
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
int blk_rq_append_bio(struct request *rq, struct bio *bio)

{

	if (!rq->bio) {

		rq->cmd_flags &= REQ_OP_MASK;

		rq->cmd_flags |= (bio->bi_opf & REQ_OP_MASK);

		blk_rq_bio_prep(rq->q, rq, bio);

	} else {

		if (!ll_back_merge_fn(rq->q, rq, bio))
@@ -62,6 +60,9 @@ static int __blk_rq_map_user_iov(struct request *rq, 
	if (IS_ERR(bio))

		return PTR_ERR(bio);



	bio->bi_opf &= ~REQ_OP_MASK;

	bio->bi_opf |= req_op(rq);



	if (map_data && map_data->null_mapped)

		bio_set_flag(bio, BIO_NULL_MAPPED);
@@ -90,7 +91,7 @@ static int __blk_rq_map_user_iov(struct request *rq, 
}



/**

 * blk_rq_map_user_iov - map user data to a request, for REQ_TYPE_BLOCK_PC usage

 * blk_rq_map_user_iov - map user data to a request, for passthrough requests

 * @q:		request queue where request should be inserted

 * @rq:		request to map data to

 * @map_data:   pointer to the rq_map_data holding pages (if necessary)
@@ -199,7 +200,7 @@ int blk_rq_unmap_user(struct bio *bio) 
EXPORT_SYMBOL(blk_rq_unmap_user);



/**

 * blk_rq_map_kern - map kernel data to a request, for REQ_TYPE_BLOCK_PC usage

 * blk_rq_map_kern - map kernel data to a request, for passthrough requests

 * @q:		request queue where request should be inserted

 * @rq:		request to fill

 * @kbuf:	the kernel buffer
@@ -234,8 +235,8 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf, 
	if (IS_ERR(bio))

		return PTR_ERR(bio);



	if (!reading)

		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);

	bio->bi_opf &= ~REQ_OP_MASK;

	bio->bi_opf |= req_op(rq);



	if (do_copy)

		rq->rq_flags |= RQF_COPY_USER;

block/blk-mq-debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ static int blk_mq_debugfs_rq_show(struct seq_file *m, void *v) 
{

	struct request *rq = list_entry_rq(v);



	seq_printf(m, "%p {.cmd_type=%u, .cmd_flags=0x%x, .rq_flags=0x%x, .tag=%d, .internal_tag=%d}\n",

		   rq, rq->cmd_type, rq->cmd_flags, (unsigned int)rq->rq_flags,

	seq_printf(m, "%p {.cmd_flags=0x%x, .rq_flags=0x%x, .tag=%d, .internal_tag=%d}\n",

		   rq, rq->cmd_flags, (unsigned int)rq->rq_flags,

		   rq->tag, rq->internal_tag);

	return 0;

}