[SSI] openssi/kernel/cluster/ssi/cfs cfstok.c,1.25,1.26

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

Modified Files:
      Tag: OPENSSI-FC
	cfstok.c 
Log Message:
CFS Token Architecture:
- Generate KERN_WARNING message if REVFUNC() fails in mhtok_giveback().
- Optimize away CFSTOK_XLOCKOWNED() test in cfstok_objrevoke(). CFSTOK_XLOCK is not held in cfstok_giveback() path.

 cluster/ssi/cfs/cfstok.c     |    5 +++++
 cluster/ssi/token/mhclitok.c |    2 ++
 2 files changed, 7 insertions(+)


Index: cfstok.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs/cfstok.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- cfstok.c	25 Oct 2010 04:43:26 -0000	1.25
+++ cfstok.c	25 Oct 2010 06:03:52 -0000	1.26
@@ -1718,6 +1718,9 @@
 	if (direct)
 		tokseq_early_accept(cfs_tsp, itocmi(ip)->mi_server);
 
+	if (type == CFSTOK_MHOLD)
+		return error;
+
 	/*
 	 * Prevent deadlocks and recursive lock attempts
 	 * by release XLOCK while performing
@@ -1729,8 +1732,10 @@
 		relock = TRUE;
 	}
 	switch (type) {
+/*
 	case CFSTOK_MHOLD:
 		break;
+*/
 	case CFSTOK_ATTR:
 #ifndef SSI_CFSTOK_SU
 		SSI_ASSERT(newmode != CFSTOK_SU);


------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev