iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zram: refactor zram_bdev_write

Browse Source 
Split the read/modify/write case into a separate helper.

Link: https://lkml.kernel.org/r/20230411171459.567614-14-hch@lst.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Minchan Kim <minchan@kernel.org>
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Christoph Hellwig
2023-04-11 19:14:55 +02:00
committed by Andrew Morton
parent 6aa4b839e7
commit a0b81ae7a4
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/block/zram/zram_drv.c
View File

@ -1568,35 +1568,35 @@ out:
return ret; return ret;
} }
static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, /*
u32 index, int offset, struct bio *bio) * This is a partial IO. Read the full page before writing the changes.
*/
static int zram_bvec_write_partial(struct zram *zram, struct bio_vec *bvec,
u32 index, int offset, struct bio *bio)
{ {
struct page *page = bvec->bv_page; struct page *page = alloc_page(GFP_NOIO);
int ret; int ret;
if (is_partial_io(bvec)) { if (!page)
/* return -ENOMEM;
* This is a partial IO. We need to read the full page
* before to write the changes.
*/
page = alloc_page(GFP_NOIO);
if (!page)
return -ENOMEM;
ret = zram_read_page(zram, page, index, bio, true);
if (ret)
goto out;
ret = zram_read_page(zram, page, index, bio, true);
if (!ret) {
memcpy_from_bvec(page_address(page) + offset, bvec); memcpy_from_bvec(page_address(page) + offset, bvec);
ret = zram_write_page(zram, page, index);
} }
__free_page(page);
ret = zram_write_page(zram, page, index);
out:
if (is_partial_io(bvec))
__free_page(page);
return ret; return ret;
} }
static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec,
u32 index, int offset, struct bio *bio)
{
if (is_partial_io(bvec))
return zram_bvec_write_partial(zram, bvec, index, offset, bio);
return zram_write_page(zram, bvec->bv_page, index);
}
#ifdef CONFIG_ZRAM_MULTI_COMP #ifdef CONFIG_ZRAM_MULTI_COMP
/* /*
* This function will decompress (unless it's ZRAM_HUGE) the page and then * This function will decompress (unless it's ZRAM_HUGE) the page and then