From 0f9fa5180fb015af656b8eea06f04b02abc02232 Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Tue, 2 Aug 2016 15:40:05 +0000 Subject: [PATCH] Revert "LU-7845 lnet: check if address is visible" This patch created a deadlock situation that is tracked under LU-8392 This reverts commit 57b80581e8f13b9f7ddb4c1135390de1ec22b11d. Change-Id: Iaa3ea51975285b241c52c2dcbebbd846e0ff1f4f Reviewed-on: http://review.whamcloud.com/21631 Tested-by: Jenkins Reviewed-by: Oleg Drokin Tested-by: Oleg Drokin --- lnet/lnet/lib-move.c | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c index 0eade04..cd7c0e9 100644 --- a/lnet/lnet/lib-move.c +++ b/lnet/lnet/lib-move.c @@ -2497,36 +2497,11 @@ LNetDist(lnet_nid_t dstnid, lnet_nid_t *srcnidp, __u32 *orderp) return local_nid_dist_zero ? 0 : 1; } - if (LNET_NIDNET(ni->ni_nid) == dstnet) { - if (ni->ni_interfaces[0] != NULL) { - /* Check if ni's address is the one visible in - * current namespace. - * If not, assign order above 0xffff0000, - * to make this ni not a priority. */ - int i, up, rc; - __u32 mask, addr; - char *name; - for (i = 0; i < ARRAY_SIZE(ni->ni_interfaces); - i++) { - if (ni->ni_interfaces[i] == NULL) - continue; - name = ni->ni_interfaces[i]; - rc = lnet_ipif_query(name, &up, &addr, - &mask); - if ((rc != 0) || (rc == 0 && - (!up || - LNET_NIDADDR(ni->ni_nid) != - addr))) { - order += 0xffff0000; - break; - } - } - } - - if (srcnidp != NULL) - *srcnidp = ni->ni_nid; - if (orderp != NULL) - *orderp = order; + if (LNET_NIDNET(ni->ni_nid) == dstnet) { + if (srcnidp != NULL) + *srcnidp = ni->ni_nid; + if (orderp != NULL) + *orderp = order; lnet_net_unlock(cpt); return 1; } -- 1.8.3.1