X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fptlrpc%2Fimport.c;h=eb4b5fa60605a7d2ee60af06b3633b2756a4814c;hb=58ef2320402c65676128e7e61e6201d04385be18;hp=aba05cfcf2433290a6fb3796496c471c7b59df9b;hpb=14192d039e9247b0f79889c4f8fa1f7dfe1ae7f4;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index aba05cf..eb4b5fa 100644
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -644,7 +644,14 @@ static int ptlrpc_connect_interpret(struct ptlrpc_request *request,
                                 *lustre_msg_get_handle(request->rq_repmsg);
 
                 IMPORT_SET_STATE(imp, LUSTRE_IMP_FULL);
-                ptlrpc_activate_import(imp);
+                spin_lock(&imp->imp_lock);
+                if (imp->imp_invalid) {
+                        spin_unlock(&imp->imp_lock);
+                        ptlrpc_activate_import(imp);
+                } else {
+                        spin_unlock(&imp->imp_lock);
+                }
+
                 GOTO(finish, rc = 0);
         } else {
                 spin_unlock(&imp->imp_lock);