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: Hannes Reinecke <hare@suse.com>
Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com>
Reviewed-by: Javier González <javier@javigon.com>
Reviewed-by: Matias Bjørling <mb@lightnvm.io>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

2 files changed, 6 insertions, 12 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index b6f22f219389..d1c7c69a20dd 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -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];
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);
 }