Commit 13ae4db0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

zram: use bvec_set_page to initialize bvecs 



Use the bvec_set_page helper to initialize bvecs.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20230203150634.3199647-11-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b831f3a1

drivers/block/zram/zram_drv.c

+4 −11
Original line number Diff line number Diff line
@@ -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 @@ static void zram_free_page(struct zram *zram, size_t index) 
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);