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

Commit da8d7f07 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

block: Export blk_init_request_from_bio() 



Export this function such that it becomes available to block
drivers.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Matias Bjørling <m@bjorling.me>
Cc: Adam Manzanares <adam.manzanares@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent ef697902

block/blk-core.c

+3 −2
Original line number Diff line number Diff line
@@ -1628,7 +1628,7 @@ unsigned int blk_plug_queued_count(struct request_queue *q) 
	return ret;

}



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

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

{

	if (bio->bi_opf & REQ_RAHEAD)

		req->cmd_flags |= REQ_FAILFAST_MASK;
@@ -1640,6 +1640,7 @@ void init_request_from_bio(struct request *req, struct bio *bio) 
		req->ioprio = bio_prio(bio);

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

}

EXPORT_SYMBOL_GPL(blk_init_request_from_bio);



static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio)

{
@@ -1730,7 +1731,7 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio) 
	 * We don't worry about that case for efficiency. It won't happen

	 * often, and the elevators are able to handle it.

	 */

	init_request_from_bio(req, bio);

	blk_init_request_from_bio(req, bio);



	if (test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags))

		req->cpu = raw_smp_processor_id();

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -1424,7 +1424,7 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule) 


static void blk_mq_bio_to_request(struct request *rq, struct bio *bio)

{

	init_request_from_bio(rq, bio);

	blk_init_request_from_bio(rq, bio);



	blk_account_io_start(rq, true);

}

block/blk.h

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ void blk_free_flush_queue(struct blk_flush_queue *q); 
int blk_init_rl(struct request_list *rl, struct request_queue *q,

		gfp_t gfp_mask);

void blk_exit_rl(struct request_list *rl);

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

void blk_rq_bio_prep(struct request_queue *q, struct request *rq,

			struct bio *bio);

void blk_queue_bypass_start(struct request_queue *q);

include/linux/blkdev.h

+1 −0
Original line number Diff line number Diff line
@@ -924,6 +924,7 @@ extern int blk_register_queue(struct gendisk *disk); 
extern void blk_unregister_queue(struct gendisk *disk);

extern blk_qc_t generic_make_request(struct bio *bio);

extern void blk_rq_init(struct request_queue *q, struct request *rq);

extern void blk_init_request_from_bio(struct request *req, struct bio *bio);

extern void blk_put_request(struct request *);

extern void __blk_put_request(struct request_queue *, struct request *);

extern struct request *blk_get_request(struct request_queue *, int, gfp_t);