[Ocfs2-commits] khackel commits r2656 - trunk/fs/ocfs2/dlm

[svn-commits at oss.oracle.com]

Author: khackel
Signed-off-by: mfasheh
Date: 2005-10-14 19:55:09 -0500 (Fri, 14 Oct 2005)
New Revision: 2656

Modified:
   trunk/fs/ocfs2/dlm/dlmrecovery.c
Log:
* fixes a hang on mount
* lock resources were stuck in an IN_PROGRESS state if they were 
  manually created during migration/recovery, make sure this state
  is cleared as if the lockres was created normally thru dlmlock()

Signed-off-by: mfasheh



Modified: trunk/fs/ocfs2/dlm/dlmrecovery.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmrecovery.c	2005-10-15 00:51:28 UTC (rev 2655)
+++ trunk/fs/ocfs2/dlm/dlmrecovery.c	2005-10-15 00:55:09 UTC (rev 2656)
@@ -1094,6 +1094,13 @@
 		spin_lock(&dlm->spinlock);
 		__dlm_insert_lockres(dlm, res);
 		spin_unlock(&dlm->spinlock);
+
+		/* now that the new lockres is inserted,
+		 * make it usable by other processes */
+		spin_lock(&res->spinlock);
+		res->state &= ~DLM_LOCK_RES_IN_PROGRESS;
+		spin_unlock(&res->spinlock);
+
 	}
 
 	/* at this point we have allocated everything we need,