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

block: remove blk_init_request_from_bio 



lightnvm should have never used this function, as it is sending
passthrough requests, so switch it to blk_rq_append_bio like all the
other passthrough request users.  Inline blk_init_request_from_bio into
the only remaining caller.

Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarMinwoo Im <minwoo.im.dev@gmail.com>
Reviewed-by: default avatarJavier González <javier@javigon.com>
Reviewed-by: default avatarMatias Bjørling <mb@lightnvm.io>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0c8cf8c2

block/blk-core.c

+0 −11
Original line number Diff line number Diff line
@@ -687,17 +687,6 @@ bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio, 
	return false;

}



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

{

	if (bio->bi_opf & REQ_RAHEAD)

		req->cmd_flags |= REQ_FAILFAST_MASK;



	req->__sector = bio->bi_iter.bi_sector;

	req->write_hint = bio->bi_write_hint;

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

}

EXPORT_SYMBOL_GPL(blk_init_request_from_bio);



static void handle_bad_sector(struct bio *bio, sector_t maxsector)

{

	char b[BDEVNAME_SIZE];

block/blk-mq.c

+6 −1
Original line number Diff line number Diff line
@@ -1766,7 +1766,12 @@ 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)

{

	blk_init_request_from_bio(rq, bio);

	if (bio->bi_opf & REQ_RAHEAD)

		rq->cmd_flags |= REQ_FAILFAST_MASK;



	rq->__sector = bio->bi_iter.bi_sector;

	rq->write_hint = bio->bi_write_hint;

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



	blk_account_io_start(rq, true);

}

drivers/nvme/host/lightnvm.c

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ static struct request *nvme_nvm_alloc_request(struct request_queue *q, 
	rq->cmd_flags &= ~REQ_FAILFAST_DRIVER;



	if (rqd->bio)

		blk_init_request_from_bio(rq, rqd->bio);

		blk_rq_append_bio(rq, &rqd->bio);

	else

		rq->ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, IOPRIO_NORM);

include/linux/blkdev.h

+0 −1
Original line number Diff line number Diff line
@@ -828,7 +828,6 @@ extern void blk_unregister_queue(struct gendisk *disk); 
extern blk_qc_t generic_make_request(struct bio *bio);

extern blk_qc_t direct_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 struct request *blk_get_request(struct request_queue *, unsigned int op,

				       blk_mq_req_flags_t flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE