Skip to contentSkip to conversation

dlm: cleanup remove unused code

PATCH In review Dan Carpenter 2 participants 2 messages Mar 22, 2010

Subsystems (2)
Kernel janitors Distributed lock manager (DLM)
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 dlm: cleanup remove unused code

Smatch complains because "lkb" is never NULL. Looking at it, the original code actually adds the new element to the end of the list fine, so we can just get rid of the if condition. This code is four years old and no one has complained so it must work.

Signed-off-by Dan Carpenter <[email protected]>
fs/dlm/lock.c +1 -4
index 46ffd3e..f162de5 100644
@@ -732,10 +732,7 @@ static void lkb_add_ordered(struct list_head *new, struct list_head *head,
 		if (lkb->lkb_rqmode < mode)
 			break;
 
-	if (!lkb)
-		list_add_tail(new, head);
-	else
-		__list_add(new, lkb->lkb_statequeue.prev, &lkb->lkb_statequeue);
+	__list_add(new, lkb->lkb_statequeue.prev, &lkb->lkb_statequeue);
 }
 
 /* add/remove lkb to rsb's grant/convert/wait queue */
maintainer
#1 lore raw
Quoted 4 lines · Dan Carpenter

Smatch complains because "lkb" is never NULL. Looking at it, the original code actually adds the new element to the end of the list fine, so we can just get rid of the if condition. This code is four years old and no one has complained so it must work.

Thanks, queued for the next pull.
Dave