LU-10391 lnet: change lp_disc_*_nid to struct lnet_nid

Change lp_disc_src_nid and lp_disc_dst_nid in struct lnet_peer to
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: I0f127fbc790c0821900d7b8abfa56c1a7de8f944
Reviewed-on: https://review.whamcloud.com/44620
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: Serguei Smirnov <ssmirnov@whamcloud.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 0543264..908ea85 100644 (file)
--- a/lnet/include/lnet/lib-types.h
+++ b/lnet/include/lnet/lib-types.h
@@ -663,9 +663,9 @@ struct lnet_peer {
        struct lnet_nid         lp_primary_nid;
 
        /* source NID to use during discovery */
-       lnet_nid_t              lp_disc_src_nid;
+       struct lnet_nid         lp_disc_src_nid;
        /* destination NID to use during discovery */
-       lnet_nid_t              lp_disc_dst_nid;
+       struct lnet_nid         lp_disc_dst_nid;
 
        /* net to perform discovery on */
        __u32                   lp_disc_net_id;

diff --git a/lnet/lnet/peer.c b/lnet/lnet/peer.c
index fb42ff2..dac7953 100644 (file)
--- a/lnet/lnet/peer.c
+++ b/lnet/lnet/peer.c
@@ -266,8 +266,8 @@ lnet_peer_alloc(lnet_nid_t nid4)
        init_waitqueue_head(&lp->lp_dc_waitq);
        spin_lock_init(&lp->lp_lock);
        lp->lp_primary_nid = nid;
-       lp->lp_disc_src_nid = LNET_NID_ANY;
-       lp->lp_disc_dst_nid = LNET_NID_ANY;
+       lp->lp_disc_src_nid = LNET_ANY_NID;
+       lp->lp_disc_dst_nid = LNET_ANY_NID;
        if (lnet_peers_start_down())
                lp->lp_alive = false;
        else
@@ -2654,8 +2654,8 @@ lnet_discovery_event_reply(struct lnet_peer *lp, struct lnet_event *ev)
 
        spin_lock(&lp->lp_lock);
 
-       lp->lp_disc_src_nid = ev->target.nid;
-       lp->lp_disc_dst_nid = ev->source.nid;
+       lnet_nid4_to_nid(ev->target.nid, &lp->lp_disc_src_nid);
+       lnet_nid4_to_nid(ev->source.nid, &lp->lp_disc_dst_nid);
 
        /*
         * If some kind of error happened the contents of message
@@ -3388,7 +3388,7 @@ __must_hold(&lp->lp_lock)
                         * received by lp, we need to set the discovery source
                         * NID for new_lp to the NID stored in lp.
                         */
-                       if (lp->lp_disc_src_nid != LNET_NID_ANY) {
+                       if (!LNET_NID_IS_ANY(&lp->lp_disc_src_nid)) {
                                new_lp->lp_disc_src_nid = lp->lp_disc_src_nid;
                                new_lp->lp_disc_dst_nid = lp->lp_disc_dst_nid;
                        }
@@ -3592,13 +3592,13 @@ __must_hold(&lp->lp_lock)
        /* Refcount for MD. */
        lnet_peer_addref_locked(lp);
        id.pid = LNET_PID_LUSTRE;
-       if (lp->lp_disc_dst_nid != LNET_NID_ANY)
-               id.nid = lp->lp_disc_dst_nid;
+       if (!LNET_NID_IS_ANY(&lp->lp_disc_dst_nid))
+               id.nid = lnet_nid_to_nid4(&lp->lp_disc_dst_nid);
        else
                id.nid = lnet_nid_to_nid4(&lp->lp_primary_nid);
        lnet_net_unlock(cpt);
 
-       rc = LNetPut(lp->lp_disc_src_nid, lp->lp_push_mdh,
+       rc = LNetPut(lnet_nid_to_nid4(&lp->lp_disc_src_nid), lp->lp_push_mdh,
                     LNET_ACK_REQ, id, LNET_RESERVED_PORTAL,
                     LNET_PROTO_PING_MATCHBITS, 0, 0);
 
@@ -3608,8 +3608,8 @@ __must_hold(&lp->lp_lock)
         * get set to a specific NID, if we initiate discovery from the
         * scratch
         */
-       lp->lp_disc_src_nid = LNET_NID_ANY;
-       lp->lp_disc_dst_nid = LNET_NID_ANY;
+       lp->lp_disc_src_nid = LNET_ANY_NID;
+       lp->lp_disc_dst_nid = LNET_ANY_NID;
 
        if (rc)
                goto fail_unlink;