[SSI] openssi/kernel/cluster/ssi/token clitok.c,1.10,1.11

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

Modified Files:
      Tag: OPENSSI-FC
	clitok.c 
Log Message:
CFS:
- hfind() calculate hash value outside critical section.

CFS Token Architecture:
- Always inline _cfstok_revoke(), process_req(), allocnrrev().
- process_req() is renamed to _process_req().
- allocnrrev() is renamed to _allocnrrev().

 cluster/ssi/cfs/cfstok.c         |    2 +-
 cluster/ssi/cfs/svrcfs.c         |    7 ++++++-
 cluster/ssi/token/clitok.c       |   12 ++++++------
 include/cluster/ssi/cfs/cfstok.h |    3 ---
 4 files changed, 13 insertions(+), 11 deletions(-)


Index: clitok.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/token/clitok.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- clitok.c	17 Dec 2009 06:43:51 -0000	1.10
+++ clitok.c	25 Oct 2010 04:43:26 -0000	1.11
@@ -448,8 +448,8 @@
 /*
  * Pull a revoke structure off the free list or allocate a new one
  */
-STATIC struct nrrevoke *
-allocnrrev(void)
+static inline struct nrrevoke *
+_allocnrrev(void)
 {
 	struct nrrevoke *revp;
 
@@ -498,8 +498,8 @@
  * compatible.  We must do this because the server couldn't grant a
  * new request until the revoke is honored.
  */
-STATIC void
-process_req(
+static inline void
+_process_req(
 	object_t *objp,
 	struct nrreq *reqp)
 {
@@ -595,7 +595,7 @@
 #else
 	while((reqp = (struct nrreq *)deletefifo(fifo))) {
 #endif
-		process_req(objp, reqp);
+		_process_req(objp, reqp);
 	}
 }
 
@@ -1151,7 +1151,7 @@
 		MSGSEND(objp, REVFAIL, (range_off_t)0, (range_off_t)0, agent, oldmode, newmode);
 		return;
 	}
-	revp = allocnrrev();
+	revp = _allocnrrev();
 	initfifo(&revp->rev_reqfifo);
 	revp->rev_oldmode = oldmode;
 	revp->rev_newmode = newmode;


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