land b_md onto HEAD. almost entirely small cleanups and miscellaneous 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 db072e0..680d4f0 100644 (file)
--- a/lustre/ldlm/l_lock.c
+++ b/lustre/ldlm/l_lock.c
@@ -20,15 +20,12 @@
  *
  */
 
-
-
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/unistd.h>
 #include <linux/version.h>
 
@@ -62,14 +59,15 @@ void l_lock_init(struct lustre_lock *lock)
 void l_lock(struct lustre_lock *lock)
 {
         int owner = 0;
+
         spin_lock(&lock->l_spin);
-        if (lock->l_owner == current) { 
+        if (lock->l_owner == current)
                 owner = 1;
-        }
         spin_unlock(&lock->l_spin);
-        if (owner)
-                 ++lock->l_depth;
-        else { 
+
+        if (owner) {
+                ++lock->l_depth;
+        } else {
                 down(&lock->l_sem);
                 spin_lock(&lock->l_spin);
                 lock->l_owner = current;
@@ -80,17 +78,31 @@ void l_lock(struct lustre_lock *lock)
 
 void l_unlock(struct lustre_lock *lock)
 {
-        if (lock->l_owner != current)
-                LBUG();
-        if (lock->l_depth < 0)
-                LBUG();
+        LASSERT(lock->l_owner == current);
+        LASSERT(lock->l_depth >= 0);
 
-        spin_lock(&lock->l_spin); 
-        if (--lock->l_depth < 0) { 
+        spin_lock(&lock->l_spin);
+        if (--lock->l_depth < 0) {
                 lock->l_owner = NULL;
                 spin_unlock(&lock->l_spin);
                 up(&lock->l_sem);
-                return ;
+                return;
         }
         spin_unlock(&lock->l_spin);
 }
+
+int l_has_lock(struct lustre_lock *lock)
+{
+        int depth = -1, owner = 0;
+
+        spin_lock(&lock->l_spin);
+        if (lock->l_owner == current) {
+                depth = lock->l_depth;
+                owner = 1;
+        }
+        spin_unlock(&lock->l_spin);
+
+        if (depth >= 0)
+                CDEBUG(D_INFO, "lock_depth: %d\n", depth);
+        return owner;
+}