Commit 693dc1ce authored by Minchan Kim's avatar Minchan Kim Committed by Linus Torvalds

zram: rename zram_decompress_page to __zram_bvec_read

zram_decompress_page naming is not proper because it doesn't decompress
if page was dedup hit or stored with compression.

Use more abstract term and consistent with write path function
__zram_bvec_write.

Link: http://lkml.kernel.org/r/1498459987-24562-4-git-send-email-minchan@kernel.orgSigned-off-by: default avatarMinchan Kim <minchan@kernel.org>
Cc: Juneho Choi <juno.choi@lge.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 97ec7c8b
...@@ -518,7 +518,7 @@ static void zram_free_page(struct zram *zram, size_t index) ...@@ -518,7 +518,7 @@ static void zram_free_page(struct zram *zram, size_t index)
zram_set_obj_size(zram, index, 0); zram_set_obj_size(zram, index, 0);
} }
static int zram_decompress_page(struct zram *zram, struct page *page, u32 index) static int __zram_bvec_read(struct zram *zram, struct page *page, u32 index)
{ {
int ret; int ret;
unsigned long handle; unsigned long handle;
...@@ -570,7 +570,7 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec, ...@@ -570,7 +570,7 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
return -ENOMEM; return -ENOMEM;
} }
ret = zram_decompress_page(zram, page, index); ret = __zram_bvec_read(zram, page, index);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
...@@ -718,7 +718,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, ...@@ -718,7 +718,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec,
if (!page) if (!page)
return -ENOMEM; return -ENOMEM;
ret = zram_decompress_page(zram, page, index); ret = __zram_bvec_read(zram, page, index);
if (ret) if (ret)
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment