From 3e47a1cfba5a8af7dc3c10a4705d8047abdc26c3 Mon Sep 17 00:00:00 2001 From: Bhaktipriya Shridhar Date: Sat, 12 Mar 2016 01:33:46 +0530 Subject: [PATCH] staging: lustre: lnet: peer: Use list_for_each_entry_safe Doubly linked lists which are iterated using list_empty and list_entry macros have been replaced with list_for_each_entry_safe macro. This makes the iteration simpler and more readable. This patch replaces the while loop containing list_empty and list_entry with list_for_each_entry_safe. This was done with Coccinelle. @@ expression E1; identifier I1, I2; type T; iterator name list_for_each_entry_safe; @@ T *I1; + T *tmp; ... - while (list_empty(&E1) == 0) + list_for_each_entry_safe (I1, tmp, &E1, I2) { ...when != T *I1; - I1 = list_entry(E1.next, T, I2); ... } Signed-off-by: Bhaktipriya Shridhar Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lnet/lnet/peer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/lustre/lnet/lnet/peer.c b/drivers/staging/lustre/lnet/lnet/peer.c index 19c80c92d5c7..b026feebc03a 100644 --- a/drivers/staging/lustre/lnet/lnet/peer.c +++ b/drivers/staging/lustre/lnet/lnet/peer.c @@ -177,6 +177,7 @@ lnet_peer_tables_cleanup(lnet_ni_t *ni) struct lnet_peer_table *ptable; struct list_head deathrow; lnet_peer_t *lp; + lnet_peer_t *temp; int i; INIT_LIST_HEAD(&deathrow); @@ -210,8 +211,7 @@ lnet_peer_tables_cleanup(lnet_ni_t *ni) lnet_net_unlock(i); } - while (!list_empty(&deathrow)) { - lp = list_entry(deathrow.next, lnet_peer_t, lp_hashlist); + list_for_each_entry_safe(lp, temp, &deathrow, lp_hashlist) { list_del(&lp->lp_hashlist); LIBCFS_FREE(lp, sizeof(*lp)); } -- 2.39.5