X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_plain.c;h=86a893bc3bf40be6be05e56def0b269e7bd43035;hb=1984882771ba22f36b5d3d61f94b98268abaf4ca;hp=a5435195e2defa5822f7e9f5748aba9a4e6f57c3;hpb=d658d73b5231ba24d2e31315102c6e17dd247364;p=fs%2Flustre-release.git

diff --git a/lustre/ldlm/ldlm_plain.c b/lustre/ldlm/ldlm_plain.c
index a543519..86a893b 100644
--- a/lustre/ldlm/ldlm_plain.c
+++ b/lustre/ldlm/ldlm_plain.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -149,8 +149,9 @@ int ldlm_process_plain_lock(struct ldlm_lock *lock, __u64 *flags,
         int rc;
         ENTRY;
 
-        check_res_locked(res);
-        LASSERT(cfs_list_empty(&res->lr_converting));
+	LASSERT(lock->l_granted_mode != lock->l_req_mode);
+	check_res_locked(res);
+	LASSERT(cfs_list_empty(&res->lr_converting));
 
         if (!first_enq) {
                 LASSERT(work_list != NULL);