[Ocfs2-commits] mfasheh commits r882 - in trunk/src: . inc

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-04-28 18:24:33 -0500 (Wed, 28 Apr 2004)
New Revision: 882

Modified:
   trunk/src/alloc.c
   trunk/src/inc/ocfs.h
   trunk/src/osb.c
Log:
* get rid of vol_alloc_lock (an ocfs_sem) and replace it with a struct semaphore "vol_alloc_sem"



Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c	2004-04-28 23:24:06 UTC (rev 881)
+++ trunk/src/alloc.c	2004-04-28 23:24:33 UTC (rev 882)
@@ -577,7 +577,7 @@
 	}
 
 	if (Type == DISK_ALLOC_VOLUME) {
-		ocfs_down_sem (&(osb->vol_alloc_lock), true);
+		down (&(osb->vol_alloc_sem));
 		needs_unlock = true;
 
 		/* don't need to read it here as
@@ -654,7 +654,7 @@
 leave:
 	if (needs_unlock) {
 		if (Type == DISK_ALLOC_VOLUME)
-			ocfs_up_sem (&(osb->vol_alloc_lock));
+			up (&(osb->vol_alloc_sem));
 		else
 			up (&(osb->node_alloc_sem));
 	}
@@ -2781,7 +2781,7 @@
 		local_lock = false;
 		bh = lock_bh;
 	} else /* local lock */
-		ocfs_down_sem (&(osb->vol_alloc_lock), true);
+		down (&(osb->vol_alloc_sem));
 
 	if (!bitmap_inode) {
 		bitmap_inode = ocfs_iget(osb, OCFS_BITMAP_LOCK_OFFSET, 0, NULL);
@@ -2932,7 +2932,7 @@
 		OCFS_BH_PUT_DATA(bh);
 
 	if (local_lock) {
-		ocfs_up_sem (&(osb->vol_alloc_lock));
+		up (&(osb->vol_alloc_sem));
 
 		if (bLockAcquired) {
 			tmpstat = ocfs_release_lock(osb, 
@@ -2990,8 +2990,6 @@
 
 	LOG_ENTRY_ARGS("(FileSize = (%llu), Type=%d)\n", FileSize,Type);
 
-	ocfs_down_sem (&(osb->vol_alloc_lock), true);
-
 	if (Type == DISK_ALLOC_DIR_NODE) {
 		bm_file = OCFS_FILE_DIR_ALLOC_BITMAP + NodeNum;
 		blockSize = (__u32) osb->vol_layout.dir_node_size;
@@ -3169,9 +3167,6 @@
 	}
 
 leave:
-	
-        ocfs_up_sem (&(osb->vol_alloc_lock));
-
 	if (needs_uninit)
 		ocfs_uninitialize_bitmap(&bitmap);
 
@@ -3498,7 +3493,7 @@
 	}
 
 	if (local_lock) {
-		ocfs_down_sem (&(osb->vol_alloc_lock), true);
+		down (&(osb->vol_alloc_sem));
 
 		/* Get the allocation lock here */
 		status = ocfs_acquire_lock (osb, OCFS_BITMAP_LOCK_OFFSET,
@@ -3565,7 +3560,7 @@
 
 bail:
 	if (local_lock) {
-		ocfs_up_sem (&(osb->vol_alloc_lock));
+		up (&(osb->vol_alloc_sem));
 
 		if (lockres) {
 			tmpstat = ocfs_release_lock (osb, 
@@ -3803,14 +3798,14 @@
 		alloc = NULL;
 
 		/* lock bitmap here */
-		ocfs_down_sem (&(osb->vol_alloc_lock), true);
+		down (&(osb->vol_alloc_sem));
 
 		if (!main_bm_inode)
 			main_bm_inode = ocfs_iget(osb, OCFS_BITMAP_LOCK_OFFSET,
 						  0, NULL);
 
 		if (!main_bm_inode) {
-			ocfs_up_sem (&(osb->vol_alloc_lock));
+			up (&(osb->vol_alloc_sem));
 			status = -EINVAL;
 			LOG_ERROR_STATUS (status);
 			goto bail;
@@ -3822,7 +3817,7 @@
 					    &lockres, &main_bm_bh, 
 					    main_bm_inode);
 		if (status < 0) {
-			ocfs_up_sem (&(osb->vol_alloc_lock));
+			up (&(osb->vol_alloc_sem));
 			if (status != -EINTR)
 				LOG_ERROR_STATUS (status);
 			goto bail;
@@ -3882,7 +3877,7 @@
 bail:
 	/* if we locked the main bitmap, cleanup after ourselves. */
 	if (main_bm_bh) {
-		ocfs_up_sem (&(osb->vol_alloc_lock));
+		up (&(osb->vol_alloc_sem));
 
 		tmpstat = ocfs_release_lock (osb, 
 					     OCFS_BITMAP_LOCK_OFFSET,

Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h	2004-04-28 23:24:06 UTC (rev 881)
+++ trunk/src/inc/ocfs.h	2004-04-28 23:24:33 UTC (rev 882)
@@ -1944,7 +1944,7 @@
 	bool disable_recovery;
 	atomic_t num_recovery_threads;
 	struct semaphore node_alloc_sem;
-	ocfs_sem vol_alloc_lock;
+	struct semaphore vol_alloc_sem;
 	struct timer_list lock_timer;
 	atomic_t lock_stop;
 	wait_queue_head_t lock_event;

Modified: trunk/src/osb.c
===================================================================
--- trunk/src/osb.c	2004-04-28 23:24:06 UTC (rev 881)
+++ trunk/src/osb.c	2004-04-28 23:24:33 UTC (rev 882)
@@ -73,8 +73,6 @@
 		goto bail;
 	}
 
-	ocfs_init_sem (&(osb->vol_alloc_lock));
-
 	init_MUTEX (&(osb->osb_res));
 	init_MUTEX (&(osb->recovery_lock));
 	init_MUTEX (&(osb->comm_lock));
@@ -83,6 +81,7 @@
 	init_MUTEX (&(osb->cfg_lock));
 	init_MUTEX (&(osb->vote_sem));
 	init_MUTEX (&(osb->node_alloc_sem));
+	init_MUTEX (&(osb->vol_alloc_sem));
 
 	spin_lock_init(&osb->recovery_map_lock);
 	osb->recovery_map = 0;