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
ORNL-27: Cancel on completion lock on the MGS
[fs/lustre-release.git]
/
lustre
/
ldlm
/
ldlm_internal.h
diff --git
a/lustre/ldlm/ldlm_internal.h
b/lustre/ldlm/ldlm_internal.h
index
f205ea6
..
f9184f3
100644
(file)
--- a/
lustre/ldlm/ldlm_internal.h
+++ b/
lustre/ldlm/ldlm_internal.h
@@
-253,7
+253,7
@@
static inline int is_granted_or_cancelled(struct ldlm_lock *lock)
lock_res_and_lock(lock);
if (((lock->l_req_mode == lock->l_granted_mode) &&
!(lock->l_flags & LDLM_FL_CP_REQD)) ||
- (lock->l_flags &
LDLM_FL_FAILED
))
+ (lock->l_flags &
(LDLM_FL_FAILED | LDLM_FL_CANCEL)
))
ret = 1;
unlock_res_and_lock(lock);