From: zhanghc <zhanghc>
Date: Tue, 11 Nov 2008 06:11:35 +0000 (+0000)
Subject: branch b1_6
X-Git-Tag: GIT_EPOCH_B_RELEASE_1_6_7~2^3~93
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=a85a8430b89d90ca9d2f16f303a7c08488daf22a;p=fs%2Flustre-release.git

branch b1_6

b=17176

fixed a bug in 14774 patch -- compare peer's nid instead of self's nid
in ptlrpc_connection during select failover MDS/OST nodes

i=deen
---

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 92d422e..5a635bc 100644
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -701,8 +701,8 @@ static void ptlrpc_maybe_ping_import_soon(struct obd_import *imp)
          * to have two identical connections in imp_conn_list. We must
          * compare not conn's pointers but NIDs, otherwise we can defeat
          * connection throttling. (See bug 14774.) */
-        if (imp->imp_conn_current->oic_conn->c_self !=
-                                imp_conn->oic_conn->c_self) {
+        if (imp->imp_conn_current->oic_conn->c_peer.nid !=
+                                imp_conn->oic_conn->c_peer.nid) {
                 ptlrpc_ping_import_soon(imp);
                 wake_pinger = 1;
         }