staging: lustre: lnet: Replace list_for_each with list_for_each_entry

Replace use of the combination of list_for_each and list_entry
with list_for_each_entry to simplify the code and remove variables
that are used only in list_for_each.
Issue found and corrected using Coccinelle script:

@r@
expression head, member, e;
type T1, T2, T3;
iterator name list_for_each, list_for_each_entry;
identifier pos, var;
@@

-T1 *pos;
...when!=pos=e;

-list_for_each(pos, head)
+list_for_each_entry(var, head, member)
{
...when!=pos=e;
   when!=T3 *var;
-var = list_entry(pos, T2, member);
...when!=pos=e;
}
...when!=pos=e;

Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c
index 3df101bafd9fc93d63589d103fbd7278fb6a6e74..b8eba3325f52e36bbf9d55a2bea8722b3cbb5665 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/router.c
+++ b/drivers/staging/lustre/lnet/lnet/router.c
@@ -222,15 +222,12 @@ struct lnet_remotenet *
 lnet_find_net_locked(__u32 net)
 {
        struct lnet_remotenet *rnet;
-       struct list_head *tmp;
        struct list_head *rn_list;
 
        LASSERT(!the_lnet.ln_shutdown);
 
        rn_list = lnet_net2rnethash(net);
-       list_for_each(tmp, rn_list) {
-               rnet = list_entry(tmp, struct lnet_remotenet, lrn_list);
-
+       list_for_each_entry(rnet, rn_list, lrn_list) {
                if (rnet->lrn_net == net)
                        return rnet;
        }
@@ -243,7 +240,6 @@ static void lnet_shuffle_seed(void)
        __u32 lnd_type, seed[2];
        struct timespec64 ts;
        struct lnet_ni *ni;
-       struct list_head *tmp;
 
        if (seeded)
                return;
@@ -254,8 +250,7 @@ static void lnet_shuffle_seed(void)
         * Nodes with small feet have little entropy
         * the NID for this node gives the most entropy in the low bits
         */
-       list_for_each(tmp, &the_lnet.ln_nis) {
-               ni = list_entry(tmp, struct lnet_ni, ni_list);
+       list_for_each_entry(ni, &the_lnet.ln_nis, ni_list) {
                lnd_type = LNET_NETTYP(LNET_NIDNET(ni->ni_nid));
 
                if (lnd_type != LOLND)