From: bobijam <bobijam>
Date: Thu, 6 Dec 2007 03:49:23 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: v1_8_0_110~935
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=fb9d78b4ccf00c98eea862688a7e08129c132298;p=fs%2Flustre-release.git

Branch b1_6
b=13715
i=johann, nathan

Don't let out-dated timedout request invalidate the import.
---

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 3221c67..b7cff71 100644
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -806,7 +806,8 @@ finish:
  out:
         if (rc != 0) {
                 IMPORT_SET_STATE(imp, LUSTRE_IMP_DISCON);
-                if (aa->pcaa_initial_connect && !imp->imp_initial_recov)
+                if (aa->pcaa_initial_connect && !imp->imp_initial_recov &&
+                    (request->rq_import_generation == imp->imp_generation))
                         ptlrpc_deactivate_import(imp);
 
                 if (imp->imp_recon_bk && imp->imp_last_recon) {