[Ocfs2-commits] rev 749 - in trunk/src: . inc

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-02 16:45:58 -0600 (Tue, 02 Mar 2004)
New Revision: 749

Modified:
   trunk/src/inc/ocfs.h
   trunk/src/journal.c
   trunk/src/osb.c
Log:
* change recovery_lock into a proper semaphore instead of a nasty ocfs_sem
* fix a non-critical typo from a previous patch to __ocfs_recovery_thread


Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h	2004-03-02 22:20:55 UTC (rev 748)
+++ trunk/src/inc/ocfs.h	2004-03-02 22:45:58 UTC (rev 749)
@@ -1997,7 +1997,7 @@
 	ocfs_vol_state vol_state;
 	__s64 curr_trans_id;
 	bool trans_in_progress;
-	ocfs_sem recovery_lock;
+	struct semaphore recovery_lock;
 	spinlock_t recovery_map_lock;
 	__u32 recovery_map;
 	ocfs_sem dir_alloc_lock;

Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c	2004-03-02 22:20:55 UTC (rev 748)
+++ trunk/src/journal.c	2004-03-02 22:45:58 UTC (rev 749)
@@ -1395,7 +1395,6 @@
 	recalc_sigpending(current);
 	spin_unlock_irq(&current->sigmask_lock);
 #endif	
-	sprintf(current->comm, "ocfs2_recover");
 
 	status = ocfs_recover_vol(osb, node_num);
 	if (status < 0)
@@ -1465,7 +1464,7 @@
 
 	/* Grab the local recovery resource to ensure no other thread
 	 * comes in from this node for recovery */
-	ocfs_down_sem (&(osb->recovery_lock), true);
+	down(&(osb->recovery_lock));
 	recovery_lock = true;
 
 	/* get the cleanup file fe and lock */
@@ -1628,7 +1627,7 @@
 		iput(inode);
 
 	if (recovery_lock)
-		ocfs_up_sem (&(osb->recovery_lock));
+		up(&(osb->recovery_lock));
 
 	/* drop the lock on this nodes journal */
 	if (lock_res)

Modified: trunk/src/osb.c
===================================================================
--- trunk/src/osb.c	2004-03-02 22:20:55 UTC (rev 748)
+++ trunk/src/osb.c	2004-03-02 22:45:58 UTC (rev 749)
@@ -71,11 +71,11 @@
 
 	ocfs_init_sem (&(osb->osb_res));
 	ocfs_init_sem (&(osb->map_lock));
-	ocfs_init_sem (&(osb->recovery_lock));
 	ocfs_init_sem (&(osb->dir_alloc_lock));
 	ocfs_init_sem (&(osb->file_alloc_lock));
 	ocfs_init_sem (&(osb->vol_alloc_lock));
 
+	init_MUTEX (&(osb->recovery_lock));
 	init_MUTEX (&(osb->comm_lock));
 	init_MUTEX (&(osb->trans_lock));
 	init_MUTEX (&(osb->extend_sem));
@@ -482,7 +482,6 @@
 		ocfs_recover_oin_locks(osb, i);
 
 	ocfs_del_sem (&(osb->osb_res));
-	ocfs_del_sem (&(osb->recovery_lock));
 	ocfs_del_sem (&(osb->map_lock));
 	ocfs_extent_map_destroy (&osb->metadata_map);
 	ocfs_extent_map_destroy (&osb->trans_map);