Skip to content

Commit

Permalink
dlm: remove usage of list iterator for list_add() after the loop body
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
Jakob-Koschel authored and teigland committed Apr 6, 2022
1 parent ba58995 commit c490b3a
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions fs/dlm/lock.c
Original file line number Diff line number Diff line change
Expand Up @@ -1321,13 +1321,17 @@ static inline void unhold_lkb(struct dlm_lkb *lkb)
static void lkb_add_ordered(struct list_head *new, struct list_head *head,
int mode)
{
struct dlm_lkb *lkb = NULL;
struct dlm_lkb *lkb = NULL, *iter;

list_for_each_entry(lkb, head, lkb_statequeue)
if (lkb->lkb_rqmode < mode)
list_for_each_entry(iter, head, lkb_statequeue)
if (iter->lkb_rqmode < mode) {
lkb = iter;
list_add_tail(new, &iter->lkb_statequeue);
break;
}

__list_add(new, lkb->lkb_statequeue.prev, &lkb->lkb_statequeue);
if (!lkb)
list_add_tail(new, head);
}

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

0 comments on commit c490b3a

Please sign in to comment.