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-1306 ldlm: LBUG at ldlm_lock.c:213
[fs/lustre-release.git]
/
lustre
/
ldlm
/
ldlm_flock.c
diff --git
a/lustre/ldlm/ldlm_flock.c
b/lustre/ldlm/ldlm_flock.c
index
2a06ede
..
75a0bbd
100644
(file)
--- a/
lustre/ldlm/ldlm_flock.c
+++ b/
lustre/ldlm/ldlm_flock.c
@@
-535,7
+535,9
@@
ldlm_flock_interrupted_wait(void *data)
ldlm_flock_blocking_unlink(lock);
/* client side - set flag to prevent lock from being put on lru list */
+ lock_res_and_lock(lock);
lock->l_flags |= LDLM_FL_CBPENDING;
+ unlock_res_and_lock(lock);
EXIT;
}