diff options
| author | Peter Kalauskas <peskal@google.com> | 2018-11-08 11:03:13 -0800 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2018-12-10 23:42:30 +0530 |
| commit | 41ee54318f4ba3822c66079ea2cd1894f329089c (patch) | |
| tree | 26b031b76ca68e43a78950c6d76d5d8165ad6202 /drivers/block | |
| parent | 2734aadd19a9f989d37200fc9c282c1cc4b60676 (diff) | |
ANDROID: zram: set comp_len to PAGE_SIZE when page is huge
This bug was introduced when two patches were applied out of order.
* zram: drop max_zpage_size and use zs_huge_class_size()
* zram: mark incompressible page as ZRAM_HUGE
Signed-off-by: Peter Kalauskas <peskal@google.com>
Bug: 119260394
Change-Id: I437d35c8d23c15237ad9c2d5bd7f99d7bff42872
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/zram/zram_drv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 7ccc2e3e4ca3..5cc39583ad8d 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1125,6 +1125,7 @@ compress_again: } if (unlikely(comp_len >= huge_class_size)) { + comp_len = PAGE_SIZE; if (zram_wb_enabled(zram) && allow_wb) { zcomp_stream_put(zram->comp); ret = write_to_bdev(zram, bvec, index, bio, &element); |