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

zram: refactor zram_bdev_read

Browse Source 
Split the partial read into a separate helper.

Link: https://lkml.kernel.org/r/20230411171459.567614-12-hch@lst.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Acked-by: Minchan Kim <minchan@kernel.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:53 +02:00 committed by Andrew Morton
parent 79c744eeaa
commit 889ae9169b
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1416,31 +1416,31 @@ static int zram_read_page(struct zram *zram, struct page *page, u32 index,
return ret;
}
/*
* Use a temporary buffer to decompress the page, as the decompressor
* always expects a full page for the output.
*/
static int zram_bvec_read_partial(struct zram *zram, struct bio_vec *bvec,
u32 index, int offset, struct bio *bio)
{
struct page *page = alloc_page(GFP_NOIO);
int ret;
if (!page)
return -ENOMEM;
ret = zram_read_page(zram, page, index, bio, true);
if (likely(!ret))
memcpy_to_bvec(bvec, page_address(page) + offset);
__free_page(page);
return ret;
}
static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
u32 index, int offset, struct bio *bio)
{
int ret;
struct page *page;
page = bvec->bv_page;
if (is_partial_io(bvec)) {
/* Use a temporary buffer to decompress the page */
page = alloc_page(GFP_NOIO);
if (!page)
return -ENOMEM;
}
ret = zram_read_page(zram, page, index, bio, is_partial_io(bvec));
if (unlikely(ret))
goto out;
if (is_partial_io(bvec))
memcpy_to_bvec(bvec, page_address(page) + offset);
out:
if (is_partial_io(bvec))
__free_page(page);
return ret;
return zram_bvec_read_partial(zram, bvec, index, offset, bio);
return zram_read_page(zram, bvec->bv_page, index, bio, false);
}
static int __zram_bvec_write(struct zram *zram, struct bio_vec *bvec,