diff options
| author | Peter Kalauskas <peskal@google.com> | 2018-11-08 11:15:41 -0800 |
|---|---|---|
| committer | Peter Kalauskas <peskal@google.com> | 2018-11-12 17:12:48 +0000 |
| commit | 97c308ca4091e113432090ceaf242b9985d8c7c4 (patch) | |
| tree | afd629bb01633a351348d682c01cd75b84cb7286 | |
| parent | 494c2659e60e1f872c1dfc3159068b183b4a252c (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: I7b34670b1fcb749c23d3765cd1c1592df25ad741
| -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 06f2623d0199..fc1c7845f141 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1102,6 +1102,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); |