zram: Remove ZRAM_LOCK

The ZRAM_LOCK was used for locking and after the addition of spinlock_t
the bit set and cleared but there no reader of it.

Remove the ZRAM_LOCK bit.

Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Link: https://lore.kernel.org/r/20240906141520.730009-3-bigeasy@linutronix.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index c1f0f2da1ec32fb5ae12c925df9e306648de3247..60946a9a7bc4306bbd98129468245986aa9be5ac 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -59,23 +59,16 @@ static int zram_read_page(struct zram *zram, struct page *page, u32 index,
 
 static int zram_slot_trylock(struct zram *zram, u32 index)
 {
-       int ret;
-
-       ret = spin_trylock(&zram->table[index].lock);
-       if (ret)
-               __set_bit(ZRAM_LOCK, &zram->table[index].flags);
-       return ret;
+       return spin_trylock(&zram->table[index].lock);
 }
 
 static void zram_slot_lock(struct zram *zram, u32 index)
 {
        spin_lock(&zram->table[index].lock);
-       __set_bit(ZRAM_LOCK, &zram->table[index].flags);
 }
 
 static void zram_slot_unlock(struct zram *zram, u32 index)
 {
-       __clear_bit(ZRAM_LOCK, &zram->table[index].flags);
        spin_unlock(&zram->table[index].lock);
 }
 
@@ -1293,7 +1286,7 @@ out:
        zram_set_handle(zram, index, 0);
        zram_set_obj_size(zram, index, 0);
        WARN_ON_ONCE(zram->table[index].flags &
-               ~(1UL << ZRAM_LOCK | 1UL << ZRAM_UNDER_WB));
+               ~(1UL << ZRAM_UNDER_WB));
 }
 
 /*

diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
index dcc3c106ce713419fb99940527739fdbef4d2914..262fa960a0783eb4f2d7e8adbab9bced0b933416 100644 (file)
--- a/drivers/block/zram/zram_drv.h
+++ b/drivers/block/zram/zram_drv.h
@@ -45,9 +45,7 @@
 
 /* Flags for zram pages (table[page_no].flags) */
 enum zram_pageflags {
-       /* zram slot is locked */
-       ZRAM_LOCK = ZRAM_FLAG_SHIFT,
-       ZRAM_SAME,      /* Page consists the same element */
+       ZRAM_SAME = ZRAM_FLAG_SHIFT,    /* Page consists the same element */
        ZRAM_WB,        /* page is stored on backing_device */
        ZRAM_UNDER_WB,  /* page is under writeback */
        ZRAM_HUGE,      /* Incompressible page */