[Ocfs2-commits] mfasheh commits r1714 - trunk/cluster

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-12-23 15:28:47 -0600 (Thu, 23 Dec 2004)
New Revision: 1714

Modified:
   trunk/cluster/dlmmod.c
Log:
* call wake_up() when we clear the DLM_LOCK_RES_RECOVERING flag.



Modified: trunk/cluster/dlmmod.c
===================================================================
--- trunk/cluster/dlmmod.c	2004-12-21 19:56:04 UTC (rev 1713)
+++ trunk/cluster/dlmmod.c	2004-12-23 21:28:47 UTC (rev 1714)
@@ -465,6 +465,7 @@
 	}
 bail:
 	spin_unlock(&res->spinlock);
+	wake_up(&res->wq);
 	return status;
 }
 
@@ -598,7 +599,7 @@
 {
 	dlm_status status = DLM_DENIED;
 	
-	dlmprintk("type=%d, convert_type=%d\n", lock->type, lock->convert_type);
+	dlmprintk("type=%d, convert_type=%d, busy=%d\n", lock->type, lock->convert_type, res->state & DLM_LOCK_RES_IN_PROGRESS);
 	
 	if (res->state & DLM_LOCK_RES_RECOVERING) {
 		status = DLM_RECOVERING;
@@ -635,6 +636,7 @@
 	}
 bail:
 	spin_unlock(&res->spinlock);
+	wake_up(&res->wq);
 	return status;
 }
 
@@ -804,6 +806,7 @@
 		}
 		dlmprintk0("locking lock spinlock\n");
 		spin_lock(&lock->spinlock);
+		wake_up(&res->wq);
 	}
 
 	if (remove) {