From 871185e7b0f15b9aa62b6e0a431706b3fd518e21 Mon Sep 17 00:00:00 2001
From: isaac <isaac>
Date: Mon, 16 Apr 2007 15:55:47 +0000
Subject: [PATCH] b=12237, i=isaac: - landing 12237 fix from
atchley@myri.com.
---
lnet/ChangeLog | 5 +++++
lnet/klnds/mxlnd/mxlnd.c | 2 +-
lnet/klnds/mxlnd/mxlnd_cb.c | 5 ++++-
lnet/utils/portals.c | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/lnet/ChangeLog b/lnet/ChangeLog
index 7fb80a9392..f304e97bb9 100644
--- a/lnet/ChangeLog
+++ b/lnet/ChangeLog
@@ -28,6 +28,11 @@
ptllnd - Portals 3.3 / UNICOS/lc 1.5.x, 2.0.x
* bug fixes
+Severity : minor
+Frequency : 'lctl peer_list' issued on a mx net
+Bugzilla : 12237
+Description: Enable lctl's peer_list for MXLND
+
Severity : major
Frequency : after Ptllnd timeouts and portals congestion
Bugzilla : 11659
diff --git a/lnet/klnds/mxlnd/mxlnd.c b/lnet/klnds/mxlnd/mxlnd.c
index bb6991d1b7..d4287ba2be 100644
--- a/lnet/klnds/mxlnd/mxlnd.c
+++ b/lnet/klnds/mxlnd/mxlnd.c
@@ -579,7 +579,7 @@ mxlnd_init_mx(lnet_ni_t *ni)
mx_finalize();
return -1;
}
- mxret = mx_set_request_timeout(kmxlnd_data.kmx_endpt, NULL, MXLND_COMM_TIMEOUT/HZ);
+ mxret = mx_set_request_timeout(kmxlnd_data.kmx_endpt, NULL, MXLND_COMM_TIMEOUT/HZ*1000);
if (mxret != MX_SUCCESS) {
CERROR("mx_set_request_timeout() failed with %s\n",
mx_strerror(mxret));
diff --git a/lnet/klnds/mxlnd/mxlnd_cb.c b/lnet/klnds/mxlnd/mxlnd_cb.c
index 09d0c0b18a..31e0a486d3 100644
--- a/lnet/klnds/mxlnd/mxlnd_cb.c
+++ b/lnet/klnds/mxlnd/mxlnd_cb.c
@@ -1087,6 +1087,7 @@ int
mxlnd_get_peer_info(int index, lnet_nid_t *nidp, int *count)
{
int i = 0;
+ int ret = -ENOENT;
struct kmx_peer *peer = NULL;
struct kmx_conn *conn = NULL;
@@ -1099,11 +1100,13 @@ mxlnd_get_peer_info(int index, lnet_nid_t *nidp, int *count)
*nidp = peer->mxp_nid;
*count = atomic_read(&peer->mxp_refcount);
+ ret = 0;
+ break;
}
}
read_unlock(&kmxlnd_data.kmx_peers_lock);
- return -ENOENT;
+ return ret;
}
void
diff --git a/lnet/utils/portals.c b/lnet/utils/portals.c
index 10b2014f95..cefb095b24 100644
--- a/lnet/utils/portals.c
+++ b/lnet/utils/portals.c
@@ -570,7 +570,7 @@ jt_ptl_print_peers (int argc, char **argv)
int index;
int rc;
- if (!g_net_is_compatible (argv[0], SOCKLND, RALND, PTLLND,
+ if (!g_net_is_compatible (argv[0], SOCKLND, RALND, PTLLND, MXLND,
OPENIBLND, CIBLND, IIBLND, VIBLND, O2IBLND, 0))
return -1;
--
GitLab