block: remove unused function blk_bio_map_sg

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 9476b1528ded0c319efe31b95a10d3c002702298..fc1ff3b1ea1f4a9ea2dcd18d6e49eea7281eb9b3 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -283,35 +283,6 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
 }
 EXPORT_SYMBOL(blk_rq_map_sg);
 
-/**
- * blk_bio_map_sg - map a bio to a scatterlist
- * @q: request_queue in question
- * @bio: bio being mapped
- * @sglist: scatterlist being mapped
- *
- * Note:
- *    Caller must make sure sg can hold bio->bi_phys_segments entries
- *
- * Will return the number of sg entries setup
- */
-int blk_bio_map_sg(struct request_queue *q, struct bio *bio,
-                  struct scatterlist *sglist)
-{
-       struct scatterlist *sg = NULL;
-       int nsegs;
-       struct bio *next = bio->bi_next;
-       bio->bi_next = NULL;
-
-       nsegs = __blk_bios_map_sg(q, bio, sglist, &sg);
-       bio->bi_next = next;
-       if (sg)
-               sg_mark_end(sg);
-
-       BUG_ON(bio->bi_phys_segments && nsegs > bio->bi_phys_segments);
-       return nsegs;
-}
-EXPORT_SYMBOL(blk_bio_map_sg);
-
 static inline int ll_new_hw_segment(struct request_queue *q,
                                    struct request *req,
                                    struct bio *bio)

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index bf4ef666d191acddf4da9b6b491c8c2fc0079951..7f9a516f24dec57182f51cff3580db3904208a84 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1049,8 +1049,6 @@ extern void blk_queue_flush_queueable(struct request_queue *q, bool queueable);
 extern struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev);
 
 extern int blk_rq_map_sg(struct request_queue *, struct request *, struct scatterlist *);
-extern int blk_bio_map_sg(struct request_queue *q, struct bio *bio,
-                         struct scatterlist *sglist);
 extern void blk_dump_rq_flags(struct request *, char *);
 extern long nr_blockdev_pages(void);