diff options
-rw-r--r-- | block/blk-merge.c | 29 | ||||
-rw-r--r-- | include/linux/blkdev.h | 2 |
2 files changed, 0 insertions, 31 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 9476b1528ded..fc1ff3b1ea1f 100644 --- 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, | |||
283 | } | 283 | } |
284 | EXPORT_SYMBOL(blk_rq_map_sg); | 284 | EXPORT_SYMBOL(blk_rq_map_sg); |
285 | 285 | ||
286 | /** | ||
287 | * blk_bio_map_sg - map a bio to a scatterlist | ||
288 | * @q: request_queue in question | ||
289 | * @bio: bio being mapped | ||
290 | * @sglist: scatterlist being mapped | ||
291 | * | ||
292 | * Note: | ||
293 | * Caller must make sure sg can hold bio->bi_phys_segments entries | ||
294 | * | ||
295 | * Will return the number of sg entries setup | ||
296 | */ | ||
297 | int blk_bio_map_sg(struct request_queue *q, struct bio *bio, | ||
298 | struct scatterlist *sglist) | ||
299 | { | ||
300 | struct scatterlist *sg = NULL; | ||
301 | int nsegs; | ||
302 | struct bio *next = bio->bi_next; | ||
303 | bio->bi_next = NULL; | ||
304 | |||
305 | nsegs = __blk_bios_map_sg(q, bio, sglist, &sg); | ||
306 | bio->bi_next = next; | ||
307 | if (sg) | ||
308 | sg_mark_end(sg); | ||
309 | |||
310 | BUG_ON(bio->bi_phys_segments && nsegs > bio->bi_phys_segments); | ||
311 | return nsegs; | ||
312 | } | ||
313 | EXPORT_SYMBOL(blk_bio_map_sg); | ||
314 | |||
315 | static inline int ll_new_hw_segment(struct request_queue *q, | 286 | static inline int ll_new_hw_segment(struct request_queue *q, |
316 | struct request *req, | 287 | struct request *req, |
317 | struct bio *bio) | 288 | struct bio *bio) |
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index bf4ef666d191..7f9a516f24de 100644 --- 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); | |||
1049 | extern struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev); | 1049 | extern struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev); |
1050 | 1050 | ||
1051 | extern int blk_rq_map_sg(struct request_queue *, struct request *, struct scatterlist *); | 1051 | extern int blk_rq_map_sg(struct request_queue *, struct request *, struct scatterlist *); |
1052 | extern int blk_bio_map_sg(struct request_queue *q, struct bio *bio, | ||
1053 | struct scatterlist *sglist); | ||
1054 | extern void blk_dump_rq_flags(struct request *, char *); | 1052 | extern void blk_dump_rq_flags(struct request *, char *); |
1055 | extern long nr_blockdev_pages(void); | 1053 | extern long nr_blockdev_pages(void); |
1056 | 1054 | ||