[SSI] openssi/kernel/cluster/ssi/cfs cfs_server.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-serv31621/cluster/ssi/cfs

Modified Files:
      Tag: OPENSSI-FC
	cfs_server.c 
Log Message:
cfs_rb_do_phase_wait: use WAIT_CONDITION(). remove unused placeholder variable from stack.


Index: cfs_server.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs/cfs_server.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- cfs_server.c	17 Dec 2009 06:43:50 -0000	1.18
+++ cfs_server.c	17 Jan 2011 06:51:54 -0000	1.19
@@ -238,7 +238,7 @@
 	/* Signal sleepers if we are done or this is from the local node. */
 	if (done || node == this_node)
 		/* Yes. */
-		BROADCAST_INTR_CONDITION(&mip->mi_sb_state_cond);
+		BROADCAST_CONDITION(&mip->mi_sb_state_cond);
 
 } /* end cfs_rb_phase_done() */
 
@@ -563,7 +563,6 @@
 {
 	int error = 0;			/* Error returned to caller. */
 	cfs_mntinfo_t *mip;		/* Pointer to SB private data. */
-	int dummy;			/* Placeholder. */
 
 	SSI_ASSERT(cfs_sb_is_cfs(sb));
 	mip = sbtocmi(sb);
@@ -575,8 +574,7 @@
 	while (server_node == CLUSTERNODE_INVAL
 	       ? NSC_NODELIST_TESTALL(mip->mi_rb_nodelistp)
 	       : NSC_NODELIST_TEST1(mip->mi_rb_nodelistp, server_node))
-		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);
 	error = mip->mi_rb_error;
 	UNLOCK_COND_LOCK(&mip->mi_cond_lock);
 


------------------------------------------------------------------------------
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