[SSI] openssi/kernel/cluster/ssi/cfs cfstok.c, 1.24, 1.25 svrcfs.c, 1.29, 1.30

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

Modified Files:
      Tag: OPENSSI-FC
	cfstok.c svrcfs.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: svrcfs.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs/svrcfs.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- svrcfs.c	5 Mar 2010 06:32:49 -0000	1.29
+++ svrcfs.c	25 Oct 2010 04:43:26 -0000	1.30
@@ -267,10 +267,15 @@
 #endif
 #ifdef RCU_CFSTOK_TABLE
 	struct hlist_node *pos;
+#ifdef ALLOC_SVRCFS_HASH_TABLE
+	unsigned long hash = svrhash(fhp);
+#else
+	int hash = svrhash(fhp);
+#endif
 
 	rcu_read_lock();
 	hlist_for_each_entry_rcu(hp, pos,
-				 &svrcfs_hash_table[svrhash(fhp)], sct_hlist) {
+				 &svrcfs_hash_table[hash], sct_hlist) {
 		if (memcmp((caddr_t)fhp, (caddr_t)&(hp->sct_fh), fh_size))
 			continue;
 		hp = __hash_hold_and_check(hp);

Index: cfstok.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs/cfstok.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- cfstok.c	2 Feb 2010 04:31:45 -0000	1.24
+++ cfstok.c	25 Oct 2010 04:43:26 -0000	1.25
@@ -1098,7 +1098,7 @@
  * Internal version of cfstok_revoke() which assumes
  * that CFSTOK_XLOCK() is already held on entry.
  */
-void
+static inline void
 _cfstok_revoke(
 	struct	inode *ip,
 	int which,


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