LU-7845 obd: add 'network' client mount option

[fs/lustre-release.git] / lustre / ptlrpc / events.c

diff --git a/lustre/ptlrpc/events.c b/lustre/ptlrpc/events.c
index 3855b3b..13aed57 100644 (file)
--- a/lustre/ptlrpc/events.c
+++ b/lustre/ptlrpc/events.c
@@ -497,43 +497,47 @@ static void ptlrpc_master_callback(lnet_event_t *ev)
 int ptlrpc_uuid_to_peer (struct obd_uuid *uuid,
                          lnet_process_id_t *peer, lnet_nid_t *self)
 {
-        int               best_dist = 0;
-        __u32             best_order = 0;
-        int               count = 0;
-        int               rc = -ENOENT;
-        int               dist;
-        __u32             order;
-        lnet_nid_t        dst_nid;
-        lnet_nid_t        src_nid;
+       int               best_dist = 0;
+       __u32             best_order = 0;
+       int               count = 0;
+       int               rc = -ENOENT;
+       int               dist;
+       __u32             order;
+       lnet_nid_t        dst_nid;
+       lnet_nid_t        src_nid;
 
        peer->pid = LNET_PID_LUSTRE;
 
-        /* Choose the matching UUID that's closest */
-        while (lustre_uuid_to_peer(uuid->uuid, &dst_nid, count++) == 0) {
-                dist = LNetDist(dst_nid, &src_nid, &order);
-                if (dist < 0)
-                        continue;
+       /* Choose the matching UUID that's closest */
+       while (lustre_uuid_to_peer(uuid->uuid, &dst_nid, count++) == 0) {
+               if (peer->nid != LNET_NID_ANY && LNET_NIDADDR(peer->nid) == 0 &&
+                   LNET_NIDNET(dst_nid) != LNET_NIDNET(peer->nid))
+                       continue;
 
-                if (dist == 0) {                /* local! use loopback LND */
-                        peer->nid = *self = LNET_MKNID(LNET_MKNET(LOLND, 0), 0);
-                        rc = 0;
-                        break;
-                }
+               dist = LNetDist(dst_nid, &src_nid, &order);
+               if (dist < 0)
+                       continue;
 
-                if (rc < 0 ||
-                    dist < best_dist ||
-                    (dist == best_dist && order < best_order)) {
-                        best_dist = dist;
-                        best_order = order;
+               if (dist == 0) {                /* local! use loopback LND */
+                       peer->nid = *self = LNET_MKNID(LNET_MKNET(LOLND, 0), 0);
+                       rc = 0;
+                       break;
+               }
 
-                        peer->nid = dst_nid;
-                        *self = src_nid;
-                        rc = 0;
-                }
-        }
+               if (rc < 0 ||
+                   dist < best_dist ||
+                   (dist == best_dist && order < best_order)) {
+                       best_dist = dist;
+                       best_order = order;
 
-        CDEBUG(D_NET,"%s->%s\n", uuid->uuid, libcfs_id2str(*peer));
-        return rc;
+                       peer->nid = dst_nid;
+                       *self = src_nid;
+                       rc = 0;
+               }
+       }
+
+       CDEBUG(D_NET, "%s->%s\n", uuid->uuid, libcfs_id2str(*peer));
+       return rc;
 }
 
 void ptlrpc_ni_fini(void)