Commit 1ed06c83 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 510d7664

block/blk-map.c

+5 −1
Original line number Diff line number Diff line
@@ -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);

include/linux/bio.h

+0 −5
Original line number Diff line number Diff line
@@ -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);