tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

block: rename bio_iov_iter_get_pages_aligned to bio_iov_iter_get_pages

Now that the bio_iov_iter_get_pages is free again, use it instead of
the more complicated now. Also drop the unused export.

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>

authored by

Christoph Hellwig and committed by
Jens Axboe 82dd5d76 1ed06c83

+5 -6
+2 -3
block/bio.c
··· 1316 1316 } 1317 1317 1318 1318 /** 1319 - * bio_iov_iter_get_pages_aligned - add user or kernel pages to a bio 1319 + * bio_iov_iter_get_pages - add user or kernel pages to a bio 1320 1320 * @bio: bio to add pages to 1321 1321 * @iter: iov iterator describing the region to be added 1322 1322 * @len_align_mask: the mask to align the total size to, 0 for any length ··· 1336 1336 * MM encounters an error pinning the requested pages, it stops. Error 1337 1337 * is returned only if 0 pages could be pinned. 1338 1338 */ 1339 - int bio_iov_iter_get_pages_aligned(struct bio *bio, struct iov_iter *iter, 1339 + int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter, 1340 1340 unsigned len_align_mask) 1341 1341 { 1342 1342 int ret = 0; ··· 1360 1360 return bio_iov_iter_align_down(bio, iter, len_align_mask); 1361 1361 return ret; 1362 1362 } 1363 - EXPORT_SYMBOL_GPL(bio_iov_iter_get_pages_aligned); 1364 1363 1365 1364 static void submit_bio_wait_endio(struct bio *bio) 1366 1365 {
+1 -1
block/blk-map.c
··· 287 287 * No alignment requirements on our part to support arbitrary 288 288 * passthrough commands. 289 289 */ 290 - ret = bio_iov_iter_get_pages_aligned(bio, iter, 0); 290 + ret = bio_iov_iter_get_pages(bio, iter, 0); 291 291 if (ret) 292 292 goto out_put; 293 293 ret = blk_rq_append_bio(rq, bio);
+1 -1
include/linux/bio.h
··· 446 446 int bdev_rw_virt(struct block_device *bdev, sector_t sector, void *data, 447 447 size_t len, enum req_op op); 448 448 449 - int bio_iov_iter_get_pages_aligned(struct bio *bio, struct iov_iter *iter, 449 + int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter, 450 450 unsigned len_align_mask); 451 451 452 452 void bio_iov_bvec_set(struct bio *bio, const struct iov_iter *iter);
+1 -1
include/linux/blkdev.h
··· 1876 1876 static inline int bio_iov_iter_get_bdev_pages(struct bio *bio, 1877 1877 struct iov_iter *iter, struct block_device *bdev) 1878 1878 { 1879 - return bio_iov_iter_get_pages_aligned(bio, iter, 1879 + return bio_iov_iter_get_pages(bio, iter, 1880 1880 bdev_logical_block_size(bdev) - 1); 1881 1881 } 1882 1882