zram: use bvec_set_page to initialize bvecs

Use the bvec_set_page helper to initialize bvecs.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20230203150634.3199647-11-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index e290d6d970474eeba24d913a168242990a10c5f7..bd8ae4822dc3ef7e14421efa44957b43051fa838 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -703,9 +703,7 @@ static ssize_t writeback_store(struct device *dev,
        for (; nr_pages != 0; index++, nr_pages--) {
                struct bio_vec bvec;
 
-               bvec.bv_page = page;
-               bvec.bv_len = PAGE_SIZE;
-               bvec.bv_offset = 0;
+               bvec_set_page(&bvec, page, PAGE_SIZE, 0);
 
                spin_lock(&zram->wb_limit_lock);
                if (zram->wb_limit_enable && !zram->bd_wb_limit) {
@@ -1380,12 +1378,9 @@ out:
 static int zram_bvec_read_from_bdev(struct zram *zram, struct page *page,
                                    u32 index, struct bio *bio, bool partial_io)
 {
-       struct bio_vec bvec = {
-               .bv_page = page,
-               .bv_len = PAGE_SIZE,
-               .bv_offset = 0,
-       };
+       struct bio_vec bvec;
 
+       bvec_set_page(&bvec, page, PAGE_SIZE, 0);
        return read_from_bdev(zram, &bvec, zram_get_element(zram, index), bio,
                              partial_io);
 }
@@ -1652,9 +1647,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec,
                memcpy_from_bvec(dst + offset, bvec);
                kunmap_atomic(dst);
 
-               vec.bv_page = page;
-               vec.bv_len = PAGE_SIZE;
-               vec.bv_offset = 0;
+               bvec_set_page(&vec, page, PAGE_SIZE, 0);
        }
 
        ret = __zram_bvec_write(zram, &vec, index, bio);