Commit 4942cf6a authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Andrew Morton
Browse files

zram: remove redundant checks from zram_recompress() 

Size class index comparison is powerful enough so we can remove object
size comparisons.

Link: https://lkml.kernel.org/r/20221109115047.2921851-10-senozhatsky@chromium.org


Signed-off-by: default avatarSergey Senozhatsky <senozhatsky@chromium.org>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Cc: Alexey Romanov <avromanov@sberdevices.ru>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Suleiman Souhlal <suleiman@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 7c2af309

drivers/block/zram/zram_drv.c

+2 −6
Original line number Diff line number Diff line
@@ -1722,9 +1722,7 @@ static int zram_recompress(struct zram *zram, u32 index, struct page *page, 
							comp_len_new);



		/* Continue until we make progress */

		if (comp_len_new >= huge_class_size ||

		    comp_len_new >= comp_len_old ||

		    class_index_new >= class_index_old ||

		if (class_index_new >= class_index_old ||

		    (threshold && comp_len_new >= threshold)) {

			zcomp_stream_put(zram->comps[prio]);

			continue;
@@ -1747,9 +1745,7 @@ static int zram_recompress(struct zram *zram, u32 index, struct page *page, 
	 * that would save memory, mark the object as incompressible so that

	 * we will not try to compress it again.

	 */

	if (comp_len_new >= huge_class_size ||

	    comp_len_new >= comp_len_old ||

	    class_index_new >= class_index_old) {

	if (class_index_new >= class_index_old) {

		zram_set_flag(zram, index, ZRAM_INCOMPRESSIBLE);

		return 0;

	}