Konstantin Demin
c3d09a3e94
imported from https://salsa.debian.org/kernel-team/linux.git commit 9d5cc9d9d6501d7f1dd7e194d4b245bd0b6c6a22 version 6.11.4-1
68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Thu, 20 Jun 2024 12:27:11 +0200
|
|
Subject: [PATCH 2/3] zram: Remove ZRAM_LOCK
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.11/older/patches-6.11-rt7.tar.xz
|
|
|
|
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>
|
|
Link: https://lore.kernel.org/20240906141520.730009-3-bigeasy@linutronix.de
|
|
---
|
|
drivers/block/zram/zram_drv.c | 11 ++---------
|
|
drivers/block/zram/zram_drv.h | 4 +---
|
|
2 files changed, 3 insertions(+), 12 deletions(-)
|
|
|
|
--- 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 *z
|
|
|
|
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 @@ static void zram_free_page(struct zram *
|
|
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));
|
|
}
|
|
|
|
/*
|
|
--- 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 */
|