From: maxim <maxim>
Date: Fri, 17 Jul 2009 15:53:36 +0000 (+0000)
Subject: b=20079
X-Git-Tag: v1_8_2_01~1^5~19
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=20e4507f3dfe6020dfff53035040cccb52520a7c;p=fs%2Flustre-release.git

b=20079
i=isaac
i=liang
Minor bugfix of usocklnd - calling usocklnd_assign_ni_nid unconditionally
(both for user-mode and server-mode cases) to let lnet layer know our
actual nid.
---

diff --git a/lnet/ulnds/socklnd/usocklnd.c b/lnet/ulnds/socklnd/usocklnd.c
index fdab0ab..4c2de02 100644
--- a/lnet/ulnds/socklnd/usocklnd.c
+++ b/lnet/ulnds/socklnd/usocklnd.c
@@ -468,11 +468,9 @@ usocklnd_startup(lnet_ni_t *ni)
 
         ni->ni_data = net;
 
-        if (!(the_lnet.ln_pid & LNET_PID_USERFLAG)) {
-                rc = usocklnd_assign_ni_nid(ni);
-                if (rc != 0)
-                        goto startup_failed_1;
-        }
+        rc = usocklnd_assign_ni_nid(ni);
+        if (rc != 0)
+                goto startup_failed_1;
 
         LASSERT (ni->ni_lnd == &the_tcplnd);