LU-12678 lnet: use list_move where appropriate.

There are several places in lustre where "list_del" (or occasionally
"list_del_init") is followed by "list_add" or "list_add_tail" which
moves the object to a different list.
These can be combined into "list_move" or "list_move_tail".

Test-Parameters: trivial testlist=sanity-lnet

Change-Id: I481de128ea40928186f78a0a0cc26e89b43f1645
Signed-off-by: NeilBrown <neilb@suse.com>
Reviewed-on: https://review.whamcloud.com/36339
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Neil Brown <neilb@suse.de>
Reviewed-by: Shaun Tancheff <stancheff@cray.com>
Reviewed-by: Petros Koutoupis <pkoutoupis@cray.com>
Reviewed-by: Amir Shehata <ashehata@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c
index dd8b999..e6b517b 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/lnet/klnds/o2iblnd/o2iblnd.c
@@ -1702,11 +1702,10 @@ kiblnd_fail_fmr_poolset(struct kib_fmr_poolset *fps, struct list_head *zombies)
                                                      fpo_list);
 
                fpo->fpo_failed = 1;
-               list_del(&fpo->fpo_list);
                if (fpo->fpo_map_count == 0)
-                       list_add(&fpo->fpo_list, zombies);
+                       list_move(&fpo->fpo_list, zombies);
                else
-                       list_add(&fpo->fpo_list, &fps->fps_failed_pool_list);
+                       list_move(&fpo->fpo_list, &fps->fps_failed_pool_list);
        }
 
        spin_unlock(&fps->fps_lock);
@@ -2074,11 +2073,10 @@ kiblnd_fail_poolset(struct kib_poolset *ps, struct list_head *zombies)
                                                 struct kib_pool, po_list);
 
                po->po_failed = 1;
-               list_del(&po->po_list);
                if (po->po_allocated == 0)
-                       list_add(&po->po_list, zombies);
+                       list_move(&po->po_list, zombies);
                else
-                       list_add(&po->po_list, &ps->ps_failed_pool_list);
+                       list_move(&po->po_list, &ps->ps_failed_pool_list);
        }
        spin_unlock(&ps->ps_lock);
 }

diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c
index c26811c..0e58ee6 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -1051,8 +1051,7 @@ kiblnd_check_sends_locked(struct kib_conn *conn)
               !list_empty(&conn->ibc_tx_queue_rsrvd)) {
                tx = list_entry(conn->ibc_tx_queue_rsrvd.next,
                                struct kib_tx, tx_list);
-               list_del(&tx->tx_list);
-               list_add_tail(&tx->tx_list, &conn->ibc_tx_queue);
+               list_move_tail(&tx->tx_list, &conn->ibc_tx_queue);
                 conn->ibc_reserved_credits--;
         }
 
@@ -2196,8 +2195,7 @@ kiblnd_abort_txs(struct kib_conn *conn, struct list_head *txs)
                 */
                if (tx->tx_sending == 0) {
                        tx->tx_queued = 0;
-                       list_del(&tx->tx_list);
-                       list_add(&tx->tx_list, &zombies);
+                       list_move(&tx->tx_list, &zombies);
                }
        }
 

diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c
index e3e037a..ae0e658 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.c
+++ b/lnet/klnds/socklnd/socklnd.c
@@ -1538,8 +1538,7 @@ ksocknal_finalize_zcreq(struct ksock_conn *conn)
 
                tx->tx_msg.ksm_zc_cookies[0] = 0;
                tx->tx_zc_aborted = 1;  /* mark it as not-acked */
-               list_del(&tx->tx_zc_list);
-               list_add(&tx->tx_zc_list, &zlist);
+               list_move(&tx->tx_zc_list, &zlist);
        }
 
        spin_unlock(&peer_ni->ksnp_lock);

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index 2cda73c..68fdb1d 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -2429,8 +2429,7 @@ ksocknal_flush_stale_txs(struct ksock_peer_ni *peer_ni)
 
                tx->tx_hstatus = LNET_MSG_STATUS_LOCAL_TIMEOUT;
 
-               list_del(&tx->tx_list);
-               list_add_tail(&tx->tx_list, &stale_txs);
+               list_move_tail(&tx->tx_list, &stale_txs);
        }
 
        write_unlock_bh(&ksocknal_data.ksnd_global_lock);

diff --git a/lnet/klnds/socklnd/socklnd_proto.c b/lnet/klnds/socklnd/socklnd_proto.c
index de34b51..5fb7811 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_proto.c
+++ b/lnet/klnds/socklnd/socklnd_proto.c
@@ -429,8 +429,7 @@ ksocknal_handle_zcack(struct ksock_conn *conn, __u64 cookie1, __u64 cookie2)
 
                 if (c == cookie1 || c == cookie2 || (cookie1 < c && c < cookie2)) {
                         tx->tx_msg.ksm_zc_cookies[0] = 0;
-                       list_del(&tx->tx_zc_list);
-                       list_add(&tx->tx_zc_list, &zlist);
+                       list_move(&tx->tx_zc_list, &zlist);
 
                         if (--count == 0)
                                 break;

diff --git a/lnet/lnet/config.c b/lnet/lnet/config.c
index 24ec49c..412bd50 100644 (file)
--- a/lnet/lnet/config.c
+++ b/lnet/lnet/config.c
@@ -1574,8 +1574,7 @@ lnet_match_networks (char **networksp, char *ip2nets, __u32 *ipaddrs, int nip)
                list_for_each_safe(t, t2, &current_nets) {
                        tb = list_entry(t, struct lnet_text_buf, ltb_list);
 
-                       list_del(&tb->ltb_list);
-                       list_add_tail(&tb->ltb_list, &matched_nets);
+                       list_move_tail(&tb->ltb_list, &matched_nets);
 
                        len += snprintf(networks + len, sizeof(networks) - len,
                                        "%s%s", (len == 0) ? "" : ",",

diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c
index 3d9bed4..5ac7231 100644 (file)
--- a/lnet/lnet/lib-move.c
+++ b/lnet/lnet/lib-move.c
@@ -194,8 +194,7 @@ lnet_fail_nid(lnet_nid_t nid, unsigned int threshold)
                if (tp->tp_threshold == 0 ||    /* needs culling anyway */
                    nid == LNET_NID_ANY ||      /* removing all entries */
                    tp->tp_nid == nid) {        /* matched this one */
-                       list_del(&tp->tp_list);
-                       list_add(&tp->tp_list, &cull);
+                       list_move(&tp->tp_list, &cull);
                }
        }
 
@@ -233,8 +232,7 @@ fail_peer (lnet_nid_t nid, int outgoing)
                                /* only cull zombies on outgoing tests,
                                 * since we may be at interrupt priority on
                                 * incoming messages. */
-                               list_del(&tp->tp_list);
-                               list_add(&tp->tp_list, &cull);
+                               list_move(&tp->tp_list, &cull);
                        }
                        continue;
                }
@@ -248,8 +246,7 @@ fail_peer (lnet_nid_t nid, int outgoing)
                                if (outgoing &&
                                    tp->tp_threshold == 0) {
                                        /* see above */
-                                       list_del(&tp->tp_list);
-                                       list_add(&tp->tp_list, &cull);
+                                       list_move(&tp->tp_list, &cull);
                                }
                        }
                        break;

diff --git a/lnet/selftest/console.c b/lnet/selftest/console.c
index 1721d65..f250043 100644 (file)
--- a/lnet/selftest/console.c
+++ b/lnet/selftest/console.c
@@ -315,12 +315,10 @@ lstcon_group_ndlink_move(struct lstcon_group *old,
        unsigned int idx = LNET_NIDADDR(ndl->ndl_node->nd_id.nid) %
                                        LST_NODE_HASHSIZE;
 
-       list_del(&ndl->ndl_hlink);
-       list_del(&ndl->ndl_link);
        old->grp_nnode--;
 
-       list_add_tail(&ndl->ndl_hlink, &new->grp_ndl_hash[idx]);
-       list_add_tail(&ndl->ndl_link, &new->grp_ndl_list);
+       list_move_tail(&ndl->ndl_hlink, &new->grp_ndl_hash[idx]);
+       list_move_tail(&ndl->ndl_link, &new->grp_ndl_list);
        new->grp_nnode++;
 }