Skip to contentSkip to conversation

drivers/block/zram/zram_drv.c: remove WARN_ON_ONCE() in free_block_bdev()

PATCH RESEND New Yue Hu 1 participant 1 message Mar 23, 2020

Subsystems (2)
lore
Share & tools
lore

Yue Hu

author
#0 lore raw

PATCH RESEND 1/1 drivers/block/zram/zram_drv.c: remove WARN_ON_ONCE() in free_block_bdev()

From: Yue Hu <[email protected]>

Currently, free_block_bdev() only happens after alloc_block_bdev() which will ensure blk_idx bit to be set using test_and_set_bit(). So no need to do WARN_ON_ONCE(!was_set) again when freeing.

---
 drivers/block/zram/zram_drv.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/block/zram/zram_drv.c +1 -4
index 1bdb579..61b10ab 100644
@@ -570,10 +570,7 @@ static unsigned long alloc_block_bdev(struct zram *zram)
 
 static void free_block_bdev(struct zram *zram, unsigned long blk_idx)
 {
-	int was_set;
-
-	was_set = test_and_clear_bit(blk_idx, zram->bitmap);
-	WARN_ON_ONCE(!was_set);
+	clear_bit(blk_idx, zram->bitmap);
 	atomic64_dec(&zram->stats.bd_count);
 }
 
Signature · 1 line
1.9.1