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
add support for sles 8:
[fs/lustre-release.git]
/
lustre
/
ldlm
/
l_lock.c
diff --git
a/lustre/ldlm/l_lock.c
b/lustre/ldlm/l_lock.c
index
2a4f832
..
11cd02d
100644
(file)
--- a/
lustre/ldlm/l_lock.c
+++ b/
lustre/ldlm/l_lock.c
@@
-85,9
+85,9
@@
void l_lock(struct lustre_lock *lock)
void l_unlock(struct lustre_lock *lock)
{
void l_unlock(struct lustre_lock *lock)
{
- LASSERT
(lock->l_owner == current);
-
LASSERT(lock->l_depth >= 0
);
-
+ LASSERT
F(lock->l_owner == current, "lock %p, current %p\n",
+
lock->l_owner, current
);
+ LASSERTF(lock->l_depth >= 0, "depth %d\n", lock->l_depth);
spin_lock(&lock->l_spin);
if (--lock->l_depth < 0) {
lock->l_owner = NULL;
spin_lock(&lock->l_spin);
if (--lock->l_depth < 0) {
lock->l_owner = NULL;
@@
-121,11
+121,9
@@
void l_check_no_ns_lock(struct ldlm_namespace *ns)
static unsigned long next_msg;
if (l_has_lock(&ns->ns_lock) && time_after(jiffies, next_msg)) {
static unsigned long next_msg;
if (l_has_lock(&ns->ns_lock) && time_after(jiffies, next_msg)) {
- CERROR("namespace %s lock held
during RPCs
; tell phil\n",
+ CERROR("namespace %s lock held
illegally
; tell phil\n",
ns->ns_name);
ns->ns_name);
-#if (LUSTRE_KERNEL_VERSION >= 30)
- CERROR(portals_debug_dumpstack());
-#endif
+ portals_debug_dumpstack(NULL);
next_msg = jiffies + 60 * HZ;
}
}
next_msg = jiffies + 60 * HZ;
}
}
@@
-133,6
+131,9
@@
void l_check_no_ns_lock(struct ldlm_namespace *ns)
#else
void l_check_no_ns_lock(struct ldlm_namespace *ns)
{
#else
void l_check_no_ns_lock(struct ldlm_namespace *ns)
{
-#warning "FIXME: check lock in user space??"
+ if (l_has_lock(&ns->ns_lock)) {
+ CERROR("namespace %s lock held illegally; tell phil\n",
+ ns->ns_name);
+ }
}
#endif /* __KERNEL__ */
}
#endif /* __KERNEL__ */