Commit 2766f182 authored by Minchan Kim's avatar Minchan Kim Committed by Linus Torvalds

zram: fix broken page writeback

commit 0d835962 ("zram: support page writeback") introduced two
problems.  It overwrites writeback_store's return value as kstrtol's
return value, which makes return value zero so user could see zero as
return value of write syscall even though it wrote data successfully.

It also breaks index value in the loop in that it doesn't increase the
index any longer.  It means it can write only first starting block index
so user couldn't write all idle pages in the zram so lose memory saving
chance.

This patch fixes those issues.

Link: https://lkml.kernel.org/r/20210312173949.2197662-2-minchan@kernel.org
Fixes: 0d835962("zram: support page writeback")
Signed-off-by: default avatarMinchan Kim <minchan@kernel.org>
Reported-by: default avatarAmos Bianchi <amosbianchi@google.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: John Dias <joaodias@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 57e0076e
...@@ -638,8 +638,8 @@ static ssize_t writeback_store(struct device *dev, ...@@ -638,8 +638,8 @@ static ssize_t writeback_store(struct device *dev,
if (strncmp(buf, PAGE_WB_SIG, sizeof(PAGE_WB_SIG) - 1)) if (strncmp(buf, PAGE_WB_SIG, sizeof(PAGE_WB_SIG) - 1))
return -EINVAL; return -EINVAL;
ret = kstrtol(buf + sizeof(PAGE_WB_SIG) - 1, 10, &index); if (kstrtol(buf + sizeof(PAGE_WB_SIG) - 1, 10, &index) ||
if (ret || index >= nr_pages) index >= nr_pages)
return -EINVAL; return -EINVAL;
nr_pages = 1; nr_pages = 1;
...@@ -663,7 +663,7 @@ static ssize_t writeback_store(struct device *dev, ...@@ -663,7 +663,7 @@ static ssize_t writeback_store(struct device *dev,
goto release_init_lock; goto release_init_lock;
} }
while (nr_pages--) { for (; nr_pages != 0; index++, nr_pages--) {
struct bio_vec bvec; struct bio_vec bvec;
bvec.bv_page = page; bvec.bv_page = page;
......
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