[SSI] openssi/kernel/cluster/ssi/cfs cfs_chard.c,1.18,1.19

Update of /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv31718/cluster/ssi/cfs

Modified Files:
      Tag: OPENSSI-FC
	cfs_chard.c 
Log Message:
- cfs_sb_start_down: use WAIT_CONDITION(). remove unused placeholder variable from stack.
- cfs_sb_start_wants: use WAIT_CONDITION(). remove unused placeholder variable from stack.
- cfs_sb_wait_down: use WAIT_CONDITION(). remove unused placeholder variable from stack.


Index: cfs_chard.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs/cfs_chard.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- cfs_chard.c	17 Jan 2011 06:39:12 -0000	1.18
+++ cfs_chard.c	17 Jan 2011 06:52:35 -0000	1.19
@@ -170,7 +170,7 @@
 	UNLOCK_COND_LOCK(&mip->mi_cond_lock);
 	/* Notify waiters. */
 	if (state_done)
-		BROADCAST_INTR_CONDITION(&mip->mi_sb_state_cond);
+		BROADCAST_CONDITION(&mip->mi_sb_state_cond);
 
 } /* end cfs_sb_check_done() */
 
@@ -416,7 +416,6 @@
 	char vfs_is_hard;		/* TRUE => SB hard. */
 	char vfs_is_up;			/* TRUE => SB up. */
 	cfs_mntinfo_t *mip;		/* SB info. */
-	int dummy;			/* Placeholder. */
 
 	SSI_ASSERT(sb != NULL);
 	SSI_ASSERT(sb->s_count > 0);
@@ -433,8 +432,8 @@
 	if (!flag_held) {
 		LOCK_COND_LOCK(&mip->mi_cond_lock);
 		while (mip->mi_flags & MI_START_DOWN)
-			WAIT_INTR_CONDITION(&mip->mi_sb_state_cond,
-					    &mip->mi_cond_lock, FALSE, &dummy);
+			WAIT_CONDITION(&mip->mi_sb_state_cond,
+					    &mip->mi_cond_lock);
 		mip->mi_flags |= MI_START_DOWN;
 		UNLOCK_COND_LOCK(&mip->mi_cond_lock);
 	}
@@ -509,7 +508,7 @@
 			LOCK_COND_LOCK(&mip->mi_cond_lock);
 			mip->mi_flags &= ~MI_START_DOWN;
 			UNLOCK_COND_LOCK(&mip->mi_cond_lock);
-			BROADCAST_INTR_CONDITION(&mip->mi_sb_state_cond);
+			BROADCAST_CONDITION(&mip->mi_sb_state_cond);
 			/* Do clean up. */
 			cfs_sb_soft_down(sb);
 			/* sb no longer valid. */
@@ -528,7 +527,7 @@
 			LOCK_COND_LOCK(&mip->mi_cond_lock);
 			mip->mi_flags &= ~MI_START_DOWN;
 			UNLOCK_COND_LOCK(&mip->mi_cond_lock);
-			BROADCAST_INTR_CONDITION(&mip->mi_sb_state_cond);
+			BROADCAST_CONDITION(&mip->mi_sb_state_cond);
 			/* Release hold on SB. */
 			drop_super(sb);
 		}
@@ -538,7 +537,7 @@
 		/* Wake up anyone else trying to bring this SB down. */
 		mip->mi_flags &= ~MI_START_DOWN;
 		UNLOCK_COND_LOCK(&mip->mi_cond_lock);
-		BROADCAST_INTR_CONDITION(&mip->mi_sb_state_cond);
+		BROADCAST_CONDITION(&mip->mi_sb_state_cond);
 		drop_super(sb);
 	}
 
@@ -646,7 +645,6 @@
 {
 	int error = 0;			/* Error returned to caller. */
 	cfs_mntinfo_t *mip;		/* SB info. */
-	int dummy;			/* Placeholder. */
 	clusternode_t server;		/* Server node. */
 
 	SSI_ASSERT(sb != NULL);
@@ -688,8 +686,8 @@
 	LOCK_COND_LOCK(&mip->mi_cond_lock);
 	if (!error) {
 		while (mip->mi_sb_state == MI_SB_STATE_REBUILD_WANTS)
-			WAIT_INTR_CONDITION(&mip->mi_sb_state_cond,
-					    &mip->mi_cond_lock, FALSE, &dummy);
+			WAIT_CONDITION(&mip->mi_sb_state_cond,
+					    &mip->mi_cond_lock);
 		/* Writes completed properly? */
 		if (!CFS_SB_STATE_MIP(mip, MI_SB_STATE_REBUILD_WANTS_DONE))
 			/* No. */
@@ -723,7 +721,6 @@
 	char first = TRUE;		/* TRUE => first time through loop. */
 	int fsop_threads;		/* Number of active threads. */
 	cfs_mntinfo_t *mip;		/* SB info. */
-	int dummy;			/* Placeholder. */
 
 	SSI_ASSERT(count_tokwaits);
 	SSI_ASSERT(sb != NULL);
@@ -746,8 +743,8 @@
 	while (count_tokwaits
 	       && (CFS_SB_UP_MIP(mip) || (mip->mi_flags & MI_START_DOWN)))
 		/* Yes: wait for it. */
-		WAIT_INTR_CONDITION(&mip->mi_sb_state_cond,
-				    &mip->mi_cond_lock, FALSE, &dummy);
+		WAIT_CONDITION(&mip->mi_sb_state_cond,
+				    &mip->mi_cond_lock);
 	/* Wait until SB is no longer going down. */
 	while (!CFS_SB_UP_MIP(mip) && mip->mi_sb_state < MI_SB_STATE_DOWN) {
 		/* Deal with token waits? */
@@ -775,8 +772,8 @@
 		}
 		/* No: wait for a state change. */
 		else
-			WAIT_INTR_CONDITION(&mip->mi_sb_state_cond,
-					    &mip->mi_cond_lock, FALSE, &dummy);
+			WAIT_CONDITION(&mip->mi_sb_state_cond,
+					    &mip->mi_cond_lock);
 	}
 	/* Is the SB down? */
 	if (!(CFS_SB_STATE_MIP(mip, MI_SB_STATE_DOWN)


------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand 
malware threats, the impact they can have on your business, and how you 
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl