zram: reshuffle zram_free_page() flags operations

Drop some redundant zram_test_flag() calls and re-order zram_clear_flag()
calls.  Plus two small trivial coding style fixes.  No functional changes.

Link: https://lkml.kernel.org/r/20240917021020.883356-7-senozhatsky@chromium.org
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 41e40866194052ea284eff7025efb8f53a5c82f5..c59a3e9218a9c9c35a1dcba05f8c8c00562adb1b 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1499,20 +1499,17 @@ static void zram_free_page(struct zram *zram, size_t index)
 #ifdef CONFIG_ZRAM_TRACK_ENTRY_ACTIME
        zram->table[index].ac_time = 0;
 #endif
-       if (zram_test_flag(zram, index, ZRAM_IDLE))
-               zram_clear_flag(zram, index, ZRAM_IDLE);
+
+       zram_clear_flag(zram, index, ZRAM_IDLE);
+       zram_clear_flag(zram, index, ZRAM_INCOMPRESSIBLE);
+       zram_clear_flag(zram, index, ZRAM_PP_SLOT);
+       zram_set_priority(zram, index, 0);
 
        if (zram_test_flag(zram, index, ZRAM_HUGE)) {
                zram_clear_flag(zram, index, ZRAM_HUGE);
                atomic64_dec(&zram->stats.huge_pages);
        }
 
-       if (zram_test_flag(zram, index, ZRAM_INCOMPRESSIBLE))
-               zram_clear_flag(zram, index, ZRAM_INCOMPRESSIBLE);
-
-       zram_set_priority(zram, index, 0);
-       zram_clear_flag(zram, index, ZRAM_PP_SLOT);
-
        if (zram_test_flag(zram, index, ZRAM_WB)) {
                zram_clear_flag(zram, index, ZRAM_WB);
                free_block_bdev(zram, zram_get_element(zram, index));
@@ -1536,13 +1533,12 @@ static void zram_free_page(struct zram *zram, size_t index)
        zs_free(zram->mem_pool, handle);
 
        atomic64_sub(zram_get_obj_size(zram, index),
-                       &zram->stats.compr_data_size);
+                    &zram->stats.compr_data_size);
 out:
        atomic64_dec(&zram->stats.pages_stored);
        zram_set_handle(zram, index, 0);
        zram_set_obj_size(zram, index, 0);
-       WARN_ON_ONCE(zram->table[index].flags &
-               ~(1UL << ZRAM_UNDER_WB));
+       WARN_ON_ONCE(zram->table[index].flags & ~(1UL << ZRAM_UNDER_WB));
 }
 
 /*