Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-2827 ldlm: wrong handling of ldlm resends
[fs/lustre-release.git]
/
lustre
/
ldlm
/
ldlm_extent.c
diff --git
a/lustre/ldlm/ldlm_extent.c
b/lustre/ldlm/ldlm_extent.c
index
12dc35a
..
c9f1618
100644
(file)
--- a/
lustre/ldlm/ldlm_extent.c
+++ b/
lustre/ldlm/ldlm_extent.c
@@
-693,6
+693,7
@@
int ldlm_process_extent_lock(struct ldlm_lock *lock, __u64 *flags,
int contended_locks = 0;
ENTRY;
+ LASSERT(lock->l_granted_mode != lock->l_req_mode);
LASSERT(cfs_list_empty(&res->lr_converting));
LASSERT(!(*flags & LDLM_FL_DENY_ON_CONTENTION) ||
!ldlm_is_ast_discard_data(lock));