From: johann <johann>
Date: Fri, 2 May 2008 19:40:15 +0000 (+0000)
Subject: Branch b_release_1_6_5
X-Git-Tag: v1_7_0_50~29
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=ad568b0a5be6ecbab6f90b112d1bf317dff47054;p=fs%2Flustre-release.git

Branch b_release_1_6_5
b=15069
i=rread
i=wangdi

remove LASSERT in ptlrpc_invalidate_import() since ping req can be queued even
imp_invalid is set. See also bug 15716.
---

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index e65d145..8d60653 100644
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -234,7 +234,6 @@ void ptlrpc_invalidate_import(struct obd_import *imp)
                         DEBUG_REQ(D_ERROR, req, "still on delayed list");
                 }
                 spin_unlock(&imp->imp_lock);
-                LASSERT(atomic_read(&imp->imp_inflight) == 0);
         }
 
   out: