From: jxiong <jxiong>
Date: Mon, 22 Jun 2009 18:34:53 +0000 (+0000)
Subject: b=19188
X-Git-Tag: v1_9_220~117
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=5ace0491c5acd9d59c05a3a947e9fb3007ae25dd;hp=6f26bb6972042c3c983ad12da7fb2e07b726a080

b=19188
r=pravin,rread

It is bad to access the ols_lock if the lock is detached.
---

diff --git a/lustre/osc/osc_lock.c b/lustre/osc/osc_lock.c
index ddf9a34..c9d8e31 100644
--- a/lustre/osc/osc_lock.c
+++ b/lustre/osc/osc_lock.c
@@ -1360,7 +1360,6 @@ static int osc_lock_use(const struct lu_env *env,
                 lock = slice->cls_lock;
                 LASSERT(lock->cll_state == CLS_CACHED);
                 LASSERT(lock->cll_users > 0);
-                LASSERT(olck->ols_lock->l_flags & LDLM_FL_CBPENDING);
                 /* set a flag for osc_dlm_blocking_ast0() to signal the
                  * lock.*/
                 olck->ols_ast_wait = 1;