X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fgss%2Fgss_svc_upcall.c;h=99b3e00789c616b90856d96ea7a8432ad7832e1c;hb=c8301a65c5672a1d081669343466746df983eabc;hp=5b0da4bdbe51387c288aa38665304b42ffbb1197;hpb=9997f94d4b6ee335d2bf86f94bd43464d5b8f061;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/gss/gss_svc_upcall.c b/lustre/ptlrpc/gss/gss_svc_upcall.c
index 5b0da4b..99b3e00 100644
--- a/lustre/ptlrpc/gss/gss_svc_upcall.c
+++ b/lustre/ptlrpc/gss/gss_svc_upcall.c
@@ -909,9 +909,9 @@ int gss_svc_upcall_handle_init(struct ptlrpc_request *req,
 	rsikey.lustre_svc = lustre_svc;
 	/* In case of MR, rq_peer is not the NID from which request is received,
 	 * but primary NID of peer.
-	 * So we need rq_source, which contains the NID actually in use.
+	 * So we need LNetPrimaryNID(rq_source) to match what the clients uses.
 	 */
-	rsikey.nid = (__u64) req->rq_source.nid;
+	rsikey.nid = (__u64)LNetPrimaryNID(req->rq_source.nid);
 	nodemap_test_nid(req->rq_peer.nid, rsikey.nm_name,
 			 sizeof(rsikey.nm_name));