- landing MOD (MDS Originated destroy) plus few ldlm and MDS fixes.

[fs/lustre-release.git] / lustre / ldlm / l_lock.c

diff --git a/lustre/ldlm/l_lock.c b/lustre/ldlm/l_lock.c
index 262f196..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)
 {
-        LASSERT(lock->l_owner == current);
-        LASSERT(lock->l_depth >= 0);
-
+        LASSERTF(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;
@@ -118,14 +118,12 @@ int l_has_lock(struct lustre_lock *lock)
 #include <linux/lustre_version.h>
 void l_check_no_ns_lock(struct ldlm_namespace *ns)
 {
-        static long 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);
-#if (LUSTRE_KERNEL_VERSION >= 30)
-                CERROR(portals_debug_dumpstack());
-#endif
+                portals_debug_dumpstack(NULL);
                 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)
 {
-#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__ */