diff options
| author | Peter Kalauskas <peskal@google.com> | 2018-11-08 11:03:13 -0800 |
|---|---|---|
| committer | Peter Kalauskas <peskal@google.com> | 2018-11-12 17:12:42 +0000 |
| commit | 498bf61266f166b16e6990721a2c5fa25c89352d (patch) | |
| tree | a931ddec4f81fa0ee05b31da1a507ea3bd0794dc | |
| parent | 0ca3fcabdc05c1db8881aa8a9bae4734911a5597 (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
| -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); |