mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-03 10:02:20 -04:00
staging: lustre: ldlm: use list_for_each_entry in ldlm_lock.c
This makes some slightly-confusing code a bit clearer, and avoids the need for 'tmp'. Signed-off-by: NeilBrown <neilb@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
ef7e70ae99
commit
557d001aa5
@@ -886,17 +886,15 @@ static void search_granted_lock(struct list_head *queue,
|
||||
struct ldlm_lock *req,
|
||||
struct sl_insert_point *prev)
|
||||
{
|
||||
struct list_head *tmp;
|
||||
struct ldlm_lock *lock, *mode_end, *policy_end;
|
||||
|
||||
list_for_each(tmp, queue) {
|
||||
lock = list_entry(tmp, struct ldlm_lock, l_res_link);
|
||||
list_for_each_entry(lock, queue, l_res_link) {
|
||||
|
||||
mode_end = list_prev_entry(lock, l_sl_mode);
|
||||
|
||||
if (lock->l_req_mode != req->l_req_mode) {
|
||||
/* jump to last lock of mode group */
|
||||
tmp = &mode_end->l_res_link;
|
||||
lock = mode_end;
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -933,9 +931,7 @@ static void search_granted_lock(struct list_head *queue,
|
||||
break;
|
||||
|
||||
/* go to next policy group within mode group */
|
||||
tmp = policy_end->l_res_link.next;
|
||||
lock = list_entry(tmp, struct ldlm_lock,
|
||||
l_res_link);
|
||||
lock = list_next_entry(policy_end, l_res_link);
|
||||
} /* loop over policy groups within the mode group */
|
||||
|
||||
/* insert point is last lock of the mode group,
|
||||
|
||||
Reference in New Issue
Block a user