LU-10391 lnet: extend rspt_next_hop_nid in lnet_rsp_tracker

rspt_next_hop_nid in 'struct lnet_rsp_tracker' is now
a 'struct lnet_nid'.

Test-Parameters: trivial
Test-Parameters: serverversion=2.12 serverdistro=el7.9 testlist=runtests
Test-Parameters: clientversion=2.12 testlist=runtests
Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: I1348a05e572782383a2e68eb7a6be514a53b28b8
Reviewed-on: https://review.whamcloud.com/43594
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Chris Horn <chris.horn@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lnet/include/lnet/lib-types.h b/lnet/include/lnet/lib-types.h
index 85c69f2..ddcc68d 100644 (file)
--- a/lnet/include/lnet/lib-types.h
+++ b/lnet/include/lnet/lib-types.h
@@ -90,7 +90,7 @@ struct lnet_rsp_tracker {
        /* cpt to lock */
        int rspt_cpt;
        /* nid of next hop */
        /* cpt to lock */
        int rspt_cpt;
        /* nid of next hop */

-       lnet_nid_t rspt_next_hop_nid;
+       struct lnet_nid rspt_next_hop_nid;

        /* deadline of the REPLY/ACK */
        ktime_t rspt_deadline;
        /* parent MD */
        /* deadline of the REPLY/ACK */
        ktime_t rspt_deadline;
        /* parent MD */

diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c
index c4219c8..67ab256 100644 (file)
--- a/lnet/lnet/lib-move.c
+++ b/lnet/lnet/lib-move.c
@@ -1950,9 +1950,9 @@ lnet_handle_send(struct lnet_send_data *sd)
                rspt = msg->msg_md->md_rspt_ptr;
                if (rspt) {
                        rspt->rspt_next_hop_nid =
                rspt = msg->msg_md->md_rspt_ptr;
                if (rspt) {
                        rspt->rspt_next_hop_nid =

-                               lnet_nid_to_nid4(&msg->msg_txpeer->lpni_nid);
+                               msg->msg_txpeer->lpni_nid;

                        CDEBUG(D_NET, "rspt_next_hop_nid = %s\n",
                        CDEBUG(D_NET, "rspt_next_hop_nid = %s\n",

-                              libcfs_nid2str(rspt->rspt_next_hop_nid));
+                              libcfs_nidstr(&rspt->rspt_next_hop_nid));

                }
        }
 
                }
        }
 


@@ -3220,7 +3220,7 @@ lnet_finalize_expired_responses(void)
                        if (ktime_compare(now, rspt->rspt_deadline) >= 0 ||
                            the_lnet.ln_mt_state == LNET_MT_STATE_SHUTDOWN) {
                                struct lnet_peer_ni *lpni;
                        if (ktime_compare(now, rspt->rspt_deadline) >= 0 ||
                            the_lnet.ln_mt_state == LNET_MT_STATE_SHUTDOWN) {
                                struct lnet_peer_ni *lpni;

-                               lnet_nid_t nid;
+                               struct lnet_nid nid;

 
                                md = lnet_handle2md(&rspt->rspt_mdh);
                                if (!md) {
 
                                md = lnet_handle2md(&rspt->rspt_mdh);
                                if (!md) {


@@ -3278,7 +3278,7 @@ lnet_finalize_expired_responses(void)
 
                                CDEBUG(D_NET,
                                       "Response timeout: md = %p: nid = %s\n",
 
                                CDEBUG(D_NET,
                                       "Response timeout: md = %p: nid = %s\n",

-                                      md, libcfs_nid2str(nid));
+                                      md, libcfs_nidstr(&nid));

 
                                /*
                                 * If there is a timeout on the response
 
                                /*
                                 * If there is a timeout on the response


@@ -3286,7 +3286,7 @@ lnet_finalize_expired_responses(void)
                                 * value so that we don't use it
                                 */
                                lnet_net_lock(0);
                                 * value so that we don't use it
                                 */
                                lnet_net_lock(0);

-                               lpni = lnet_find_peer_ni_locked(nid);
+                               lpni = lnet_peer_ni_find_locked(&nid);

                                if (lpni) {
                                        lnet_handle_remote_failure_locked(lpni);
                                        lnet_peer_ni_decref_locked(lpni);
                                if (lpni) {
                                        lnet_handle_remote_failure_locked(lpni);
                                        lnet_peer_ni_decref_locked(lpni);