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

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

Modified Files:
      Tag: OPENSSI-FC
	svrcfs.c 
Log Message:
cluster/ssi/cfs/svrcfs.c (#ifdef SSI_CFS_SKIP)
- cfs_tokmsg: no longer invoke NSC_YIELD() when client@server for REQFAIL and REVFAIL. let the scheduler work it out.

cluster/ssi/cfs/svrcfs.c  (#ifdef SSI_NOTUSED)
- comment out svrcfstok_sendinstall_range(); not used.


Index: svrcfs.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs/svrcfs.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- svrcfs.c	15 Dec 2010 07:08:42 -0000	1.31
+++ svrcfs.c	15 Dec 2010 07:34:51 -0000	1.32
@@ -784,6 +784,7 @@
 				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.
@@ -796,6 +797,7 @@
 				/* 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);
@@ -926,6 +928,7 @@
 				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.
@@ -934,10 +937,14 @@
 			 * 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);
@@ -980,7 +987,9 @@
 	switch (args->cta_op) {
 	case GIVEBACK:
 	case INSTALL:
+#ifdef CFS_POLICY
 	case HINT:
+#endif
 		cfs_tokmsg(args);
 		break;
 	default:
@@ -1138,6 +1147,7 @@
 	return ret;
 }
 
+#ifdef SSI_NOTUSED
 /*
  * Do range and non-range version of sendinstall.
  *
@@ -1178,6 +1188,7 @@
 	process_msgs(FALSE);
 	return;
 }
+#endif /* SSI_NOTUSED */
 
 void
 svrcfstok_request_range(


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