> On 6 Jun 2019, at 12.29, Christoph Hellwig <[email protected]> wrote: > > 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. > > Signed-off-by: Christoph Hellwig <[email protected]> > --- > block/blk-core.c | 11 ----------- > block/blk-mq.c | 7 ++++++- > drivers/nvme/host/lightnvm.c | 2 +- > include/linux/blkdev.h | 1 - > 4 files changed, 7 insertions(+), 14 deletions(-) > > diff --git a/block/blk-core.c b/block/blk-core.c > index 9b88b1a3eb43..a9cb465c7ef7 100644 > --- a/block/blk-core.c > +++ b/block/blk-core.c > @@ -674,17 +674,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]; > diff --git a/block/blk-mq.c b/block/blk-mq.c > index ce0f5f4ede70..61457bffa55f 100644 > --- a/block/blk-mq.c > +++ b/block/blk-mq.c > @@ -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); > } > diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c > index 4f20a10b39d3..ba009d4c9dfa 100644 > --- a/drivers/nvme/host/lightnvm.c > +++ b/drivers/nvme/host/lightnvm.c > @@ -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); > > diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h > index 592669bcc536..c67a9510e532 100644 > --- a/include/linux/blkdev.h > +++ b/include/linux/blkdev.h > @@ -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); > -- > 2.20.1
Looks good. Reviewed-by: Javier González <[email protected]>
signature.asc
Description: Message signed with OpenPGP
