OSDN Git Service

staging: lustre: lnet: peer: Use list_for_each_entry_safe
authorBhaktipriya Shridhar <bhaktipriya96@gmail.com>
Fri, 11 Mar 2016 20:03:46 +0000 (01:33 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 12 Mar 2016 06:09:09 +0000 (22:09 -0800)
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 <bhaktipriya96@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lnet/lnet/peer.c

index 19c80c9..b026fee 100644 (file)
@@ -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));
        }