Skip to contentSkip to conversation

brd: remove a redundant check

PATCH In review Zhen Lei 1 participant 2 messages Apr 22, 2020 – Apr 24, 2020

Subsystems (2)
lore
Share & tools
lore

Zhen Lei

author
#0 lore raw

PATCH 1/1 brd: remove a redundant check

Because pages[i] can't be NULL, otherwise "pos = pages[i]->index;" will panic. So when "ret" is NULL, it can't be equal to pages[i].

---
 drivers/block/brd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/brd.c +1 -1
index 2fb25c348d53..59fec4a8ac93 100644
@@ -147,7 +147,7 @@ static void brd_free_pages(struct brd_device *brd)
 			BUG_ON(pages[i]->index < pos);
 			pos = pages[i]->index;
 			ret = radix_tree_delete(&brd->brd_pages, pos);
-			BUG_ON(!ret || ret != pages[i]);
+			BUG_ON(ret != pages[i]);
 			__free_page(pages[i]);
 		}
 
Signature · 1 line
2.26.0.106.g9fadedd
#1 lore raw
Quoted 2 lines · Zhen Lei

Because pages[i] can't be NULL, otherwise "pos = pages[i]->index;" will panic. So when "ret" is NULL, it can't be equal to pages[i].

In fact, "ret != pages[i]" is clear enough.

Quoted 20 lines
---
 drivers/block/brd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/brd.c +1 -1
index 2fb25c348d53..59fec4a8ac93 100644
@@ -147,7 +147,7 @@ static void brd_free_pages(struct brd_device *brd)
 			BUG_ON(pages[i]->index < pos);
 			pos = pages[i]->index;
 			ret = radix_tree_delete(&brd->brd_pages, pos);
-			BUG_ON(!ret || ret != pages[i]);
+			BUG_ON(ret != pages[i]);
 			__free_page(pages[i]);
 		}