Now the local variable for holding return value of bio_iov_iter_nvecs is
'nr_pages', which is a bit misleading, and the actual meaning is number
of bio vectors, and it is also used for this way.
So rename the local variable, and no function change.
Reviewed-by: Pavel Begunkov <asml.silence@xxxxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: linux-fsdevel@xxxxxxxxxxxxxxx
Signed-off-by: Ming Lei <ming.lei@xxxxxxxxxx>
---
fs/block_dev.c | 30 +++++++++++++++---------------
fs/iomap/direct-io.c | 14 +++++++-------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index fbcc900229af..d699f3af1a09 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -215,7 +215,7 @@ static void blkdev_bio_end_io_simple(struct bio *bio)
static ssize_t
__blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter,
- int nr_pages)
+ int nr_vecs)
{
struct file *file = iocb->ki_filp;
struct block_device *bdev = I_BDEV(bdev_file_inode(file));
@@ -230,16 +230,16 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter,
(bdev_logical_block_size(bdev) - 1))
return -EINVAL;
- if (nr_pages <= DIO_INLINE_BIO_VECS)
+ if (nr_vecs <= DIO_INLINE_BIO_VECS)
vecs = inline_vecs;
else {
- vecs = kmalloc_array(nr_pages, sizeof(struct bio_vec),
+ vecs = kmalloc_array(nr_vecs, sizeof(struct bio_vec),
GFP_KERNEL);
if (!vecs)
return -ENOMEM;
}
- bio_init(&bio, vecs, nr_pages);
+ bio_init(&bio, vecs, nr_vecs);
bio_set_dev(&bio, bdev);
bio.bi_iter.bi_sector = pos >> 9;
bio.bi_write_hint = iocb->ki_hint;
@@ -350,7 +350,7 @@ static void blkdev_bio_end_io(struct bio *bio)
}
static ssize_t
-__blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages)
+__blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_vecs)
{
struct file *file = iocb->ki_filp;
struct inode *inode = bdev_file_inode(file);
@@ -368,7 +368,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages)
(bdev_logical_block_size(bdev) - 1))
return -EINVAL;
- bio = bio_alloc_bioset(GFP_KERNEL, nr_pages, &blkdev_dio_pool);
+ bio = bio_alloc_bioset(GFP_KERNEL, nr_vecs, &blkdev_dio_pool);
dio = container_of(bio, struct blkdev_dio, bio);
dio->is_sync = is_sync = is_sync_kiocb(iocb);
@@ -417,8 +417,8 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages)
dio->size += bio->bi_iter.bi_size;
pos += bio->bi_iter.bi_size;
- nr_pages = bio_iov_iter_nvecs(iter, BIO_MAX_PAGES);
- if (!nr_pages) {
+ nr_vecs = bio_iov_iter_nvecs(iter, BIO_MAX_PAGES);
+ if (!nr_vecs) {
bool polled = false;
if (iocb->ki_flags & IOCB_HIPRI) {
@@ -448,7 +448,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages)
}
submit_bio(bio);
- bio = bio_alloc(GFP_KERNEL, nr_pages);
+ bio = bio_alloc(GFP_KERNEL, nr_vecs);
}
if (!is_poll)
@@ -480,15 +480,15 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages)
static ssize_t
blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
{
- int nr_pages;
+ int nr_vecs;
- nr_pages = bio_iov_iter_nvecs(iter, BIO_MAX_PAGES + 1);
- if (!nr_pages)
+ nr_vecs = bio_iov_iter_nvecs(iter, BIO_MAX_PAGES + 1);
+ if (!nr_vecs)
return 0;
- if (is_sync_kiocb(iocb) && nr_pages <= BIO_MAX_PAGES)
- return __blkdev_direct_IO_simple(iocb, iter, nr_pages);
+ if (is_sync_kiocb(iocb) && nr_vecs <= BIO_MAX_PAGES)
+ return __blkdev_direct_IO_simple(iocb, iter, nr_vecs);
- return __blkdev_direct_IO(iocb, iter, min(nr_pages, BIO_MAX_PAGES));
+ return __blkdev_direct_IO(iocb, iter, min(nr_vecs, BIO_MAX_PAGES));
}
static __init int blkdev_init(void)
diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
index 0635469e811a..cc779ecc8144 100644
--- a/fs/iomap/direct-io.c
+++ b/fs/iomap/direct-io.c
@@ -211,7 +211,7 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,
struct bio *bio;
bool need_zeroout = false;
bool use_fua = false;
- int nr_pages, ret = 0;
+ int nr_vecs, ret = 0;
size_t copied = 0;
size_t orig_count;
@@ -250,9 +250,9 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,
orig_count = iov_iter_count(dio->submit.iter);
iov_iter_truncate(dio->submit.iter, length);
- nr_pages = bio_iov_iter_nvecs(dio->submit.iter, BIO_MAX_PAGES);
- if (nr_pages <= 0) {
- ret = nr_pages;
+ nr_vecs = bio_iov_iter_nvecs(dio->submit.iter, BIO_MAX_PAGES);
+ if (nr_vecs <= 0) {
+ ret = nr_vecs;
goto out;
}
@@ -271,7 +271,7 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,
goto out;
}
- bio = bio_alloc(GFP_KERNEL, nr_pages);
+ bio = bio_alloc(GFP_KERNEL, nr_vecs);
bio_set_dev(bio, iomap->bdev);
bio->bi_iter.bi_sector = iomap_sector(iomap, pos);
bio->bi_write_hint = dio->iocb->ki_hint;
@@ -308,10 +308,10 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,
dio->size += n;
copied += n;
- nr_pages = bio_iov_iter_nvecs(dio->submit.iter, BIO_MAX_PAGES);
+ nr_vecs = bio_iov_iter_nvecs(dio->submit.iter, BIO_MAX_PAGES);
iomap_dio_submit_bio(dio, iomap, bio, pos);
pos += n;
- } while (nr_pages);
+ } while (nr_vecs);
/*
* We need to zeroout the tail of a sub-block write if the extent type
--
2.28.0
