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-3783 ldlm: ldlm_flock_deadlock() ASSERTION( req != lock ) failed
[fs/lustre-release.git]
/
lustre
/
ldlm
/
ldlm_flock.c
diff --git
a/lustre/ldlm/ldlm_flock.c
b/lustre/ldlm/ldlm_flock.c
index
2f6e357
..
6273b72
100644
(file)
--- a/
lustre/ldlm/ldlm_flock.c
+++ b/
lustre/ldlm/ldlm_flock.c
@@
-203,6
+203,9
@@
ldlm_flock_deadlock(struct ldlm_lock *req, struct ldlm_lock *bl_lock)
cfs_hash_put(bl_exp->exp_flock_hash, &lock->l_exp_flock_hash);
bl_exp = bl_exp_new;
+ if (bl_exp->exp_failed)
+ break;
+
if (bl_owner == req_owner && bl_exp == req_exp) {
class_export_put(bl_exp);
return 1;