block: remove bio_iov_iter_get_pages

Switch the only caller to bio_iov_iter_get_pages, and explain why it does
not have any alignment requirements.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-map.c b/block/blk-map.c
index 165f2234f00f4258244cc877301faf5fe6c9db2f..6cce652c7fa6527c8820ccd121c4f986a91e682f 100644 (file)
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -283,7 +283,11 @@ static int bio_map_user_iov(struct request *rq, struct iov_iter *iter,
        bio = blk_rq_map_bio_alloc(rq, nr_vecs, gfp_mask);
        if (!bio)
                return -ENOMEM;
-       ret = bio_iov_iter_get_pages(bio, iter);
+       /*
+        * No alignment requirements on our part to support arbitrary
+        * passthrough commands.
+        */
+       ret = bio_iov_iter_get_pages_aligned(bio, iter, 0);
        if (ret)
                goto out_put;
        ret = blk_rq_append_bio(rq, bio);

diff --git a/include/linux/bio.h b/include/linux/bio.h
index a64a30131031337d8c32a7b4ca53bbc7891c9002..b01dae9506de97eeaebc77f44e7fe3793eaa65ae 100644 (file)
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -449,11 +449,6 @@ int bdev_rw_virt(struct block_device *bdev, sector_t sector, void *data,
 int bio_iov_iter_get_pages_aligned(struct bio *bio, struct iov_iter *iter,
                unsigned len_align_mask);
 
-static inline int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
-{
-       return bio_iov_iter_get_pages_aligned(bio, iter, 0);
-}
-
 void bio_iov_bvec_set(struct bio *bio, const struct iov_iter *iter);
 void __bio_release_pages(struct bio *bio, bool mark_dirty);
 extern void bio_set_pages_dirty(struct bio *bio);