Skip to content

Commit c490b3a

Browse files
Jakob-Koschelteigland
authored andcommitted
dlm: remove usage of list iterator for list_add() after the loop body
In preparation to limit the scope of a list iterator to the list traversal loop, use a dedicated pointer to point to the found element [1]. Before, the code implicitly used the head when no element was found when using &pos->list. Since the new variable is only set if an element was found, the list_add() is performed within the loop and only done after the loop if it is done on the list head directly. Link: https://lore.kernel.org/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cWXJ6w@mail.gmail.com/ [1] Signed-off-by: Jakob Koschel <[email protected]> Signed-off-by: Alexander Aring <[email protected]> Signed-off-by: David Teigland <[email protected]>
1 parent ba58995 commit c490b3a

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

fs/dlm/lock.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,13 +1321,17 @@ static inline void unhold_lkb(struct dlm_lkb *lkb)
13211321
static void lkb_add_ordered(struct list_head *new, struct list_head *head,
13221322
int mode)
13231323
{
1324-
struct dlm_lkb *lkb = NULL;
1324+
struct dlm_lkb *lkb = NULL, *iter;
13251325

1326-
list_for_each_entry(lkb, head, lkb_statequeue)
1327-
if (lkb->lkb_rqmode < mode)
1326+
list_for_each_entry(iter, head, lkb_statequeue)
1327+
if (iter->lkb_rqmode < mode) {
1328+
lkb = iter;
1329+
list_add_tail(new, &iter->lkb_statequeue);
13281330
break;
1331+
}
13291332

1330-
__list_add(new, lkb->lkb_statequeue.prev, &lkb->lkb_statequeue);
1333+
if (!lkb)
1334+
list_add_tail(new, head);
13311335
}
13321336

13331337
/* add/remove lkb to rsb's grant/convert/wait queue */

0 commit comments

Comments
 (0)