[SSI] openssi/kernel/cluster/ssi/cfs svrcfs.c,1.32,1.33

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

Modified Files:
      Tag: OPENSSI-FC
	svrcfs.c 
Log Message:
cfs_tokmsg: revert. do NSC_YIELD() to avoid client@server looping on REVFAIL, REQFAIL.


Index: svrcfs.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs/svrcfs.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- svrcfs.c	15 Dec 2010 07:34:51 -0000	1.32
+++ svrcfs.c	15 Dec 2010 08:05:52 -0000	1.33
@@ -784,7 +784,6 @@
 				args->cta_agent, args->cta_start, args->cta_len);
 			break;
 		case REVFAIL:
-#ifdef SSI_CFS_SKIP
 			/* If client at server sent REVFAIL to self then,
 			 * prevent loop by giving other processes a chance
 			 * to run.
@@ -797,7 +796,6 @@
 				/* Let other threads run before retrying. */
 				NSC_YIELD();
 			}
-#endif /* SSI_CFS_SKIP */
 			svrcfstok_revfail_range(hp, args->cta_type,
 				args->cta_oldmode, args->cta_newmode,
 				args->cta_agent, args->cta_start, args->cta_len);
@@ -928,7 +926,6 @@
 				args->cta_len);
 			break;
 		case REQFAIL:
-#ifdef SSI_CFS_SKIP
 			/* If client at server sent REQFAIL to self then,
 			 * prevent loop by giving other processes a chance
 			 * to run.
@@ -937,14 +934,10 @@
 			 * prevent looping at client at server or
 			 * bogus REVFAILs from clients.
 			 */
-			/* SSI: Shouldn't happen. Requests are sequenced.
-			 * See comments for svrcheck_request().
-			 */
 			if (CFS_AT_SERVER(ip)) {
 				/* Let other threads run before retrying. */
 				NSC_YIELD();
 			}
-#endif /* SSI_CFS_SKIP */
 			cfstok_reqfail(ip, args->cta_type, args->cta_oldmode,
 				args->cta_newmode, args->cta_start,
 				args->cta_len);


------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d