Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
56293e7
)
b=23518 adjust a locktrace place.
author
Eric Mei
<eric.mei@oracle.com>
Tue, 21 Sep 2010 18:30:53 +0000
(22:30 +0400)
committer
Mikhail Pershin
<tappro@sun.com>
Mon, 27 Sep 2010 13:05:05 +0000
(17:05 +0400)
r=vitaly.fertman
lustre/obdclass/cl_lock.c
patch
|
blob
|
history
diff --git
a/lustre/obdclass/cl_lock.c
b/lustre/obdclass/cl_lock.c
index
77935bf
..
f842af3
100644
(file)
--- a/
lustre/obdclass/cl_lock.c
+++ b/
lustre/obdclass/cl_lock.c
@@
-1512,7
+1512,6
@@
int cl_wait(const struct lu_env *env, struct cl_lock *lock)
LASSERTF(lock->cll_state == CLS_ENQUEUED || lock->cll_state == CLS_HELD,
"Wrong state %d \n", lock->cll_state);
LASSERT(lock->cll_holds > 0);
- cl_lock_trace(D_DLMTRACE, env, "wait lock", lock);
do {
result = cl_wait_try(env, lock);
@@
-1528,6
+1527,7
@@
int cl_wait(const struct lu_env *env, struct cl_lock *lock)
cl_lock_error(env, lock, result);
cl_lock_lockdep_release(env, lock);
}
+ cl_lock_trace(D_DLMTRACE, env, "wait lock", lock);
cl_lock_mutex_put(env, lock);
LASSERT(ergo(result == 0, lock->cll_state == CLS_HELD));
RETURN(result);