[SSI] openssi/kernel/include/cluster/ssi/cfs cfstok.h,1.13,1.14

Update of /cvsroot/ssic-linux/openssi/kernel/include/cluster/ssi/cfs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20067/include/cluster/ssi/cfs

Modified Files:
      Tag: OPENSSI-FC
	cfstok.h 
Log Message:
CFS:
- Move redundant struct svrcfstok initialization to kmem cache constructor. (#ifdef SVRCFS_TOKEN_KMEM_CACHE)

SSI:
- Regression:
  - real_lookup() possibly returning unreferenced dentry instead of -ENOENT. (#ifndef REAL_LOOKUP_SSI_1_9_3_FIXED_PLS_VERIFY)

VPROC:
- Move redundant struct vproc initialization to kmem cache constructor. (#ifdef VPROC_KMEM_CACHE)

 cluster/ssi/cfs/cfsproc.c        |   28 ++++-----------
 cluster/ssi/cfs/inode.c          |   14 +++----
 cluster/ssi/cfs/svrcfs.c         |   59 +++++++++++++++++++++-----------
 cluster/ssi/vproc/dvp_init.c     |   59 ++++++++++++++++++++++++++++++--
 cluster/ssi/vproc/vp_subr.c      |   71 ++++++++++++++++++++++++++-------------
 fs/namei.c                       |    6 +++
 include/cluster/ssi/cfs/cfstok.h |   25 ++++++-------
 7 files changed, 177 insertions(+), 85 deletions(-)


Index: cfstok.h
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/include/cluster/ssi/cfs/cfstok.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cfstok.h	3 Feb 2009 06:18:13 -0000	1.13
+++ cfstok.h	22 Feb 2009 04:15:38 -0000	1.14
@@ -343,22 +343,23 @@
 /* **** SERVER CFS TOKEN **** */
 
 struct svrcfstok {
-	cfhandle_t sct_fh;
-	int	sct_tokmask;		/* Set when outstanding tokens exist */
-	mhsvrtcb_t sct_mhold;		/* Mhold token */
-	nrsvrtcb_t sct_tcb[CFSTOK_NTOKS - CFSTOK_NRANGE];
-#ifdef SSI_RANGE_TOKENS
-	range_tcb_t sct_rtcb[CFSTOK_NRANGE];
-#endif
 #ifdef RCU_CFSTOK_TABLE
-	struct rcu_head sct_rcu;
+	struct hlist_node sct_hlist;
 	atomic_t sct_refcnt;
 #ifdef DEBUG
 	u_long sct_magic;
 #define CFSTOK_MAGIC	0xBB55699A
 #endif
 #else
+	struct svrcfstok *sct_next, *sct_prev;
 	unsigned int sct_refcnt;
+#endif /* !RCU_CFSTOK_TABLE */
+	cfhandle_t sct_fh;
+	int	sct_tokmask;		/* Set when outstanding tokens exist */
+	mhsvrtcb_t sct_mhold;		/* Mhold token */
+	nrsvrtcb_t sct_tcb[CFSTOK_NTOKS - CFSTOK_NRANGE];
+#ifdef SSI_RANGE_TOKENS
+	range_tcb_t sct_rtcb[CFSTOK_NRANGE];
 #endif
 	struct inode *sct_ip;		/* physical file system inode */
 	struct dentry *sct_dp;		/* Physcial dentry for ISDIR only */
@@ -383,11 +384,6 @@
 #ifdef SKIP_NOTYET
 	struct contention *sct_cdata;
 #endif
-#ifdef RCU_CFSTOK_TABLE
-	struct hlist_node sct_hlist;
-#else
-	struct svrcfstok *sct_next, *sct_prev;
-#endif
 #ifdef SKIP_NOTYET
 	struct svrcfstok *sct_dinext, *sct_diprev;
 #endif
@@ -399,6 +395,9 @@
 #if !defined(CFSTOK_TABLE_LOCK_LOCK) || defined(RCU_CFSTOK_TABLE)
 	struct list_head sct_prlist;
 #endif
+#ifdef RCU_CFSTOK_TABLE
+	struct rcu_head sct_rcu;
+#endif
 };
 typedef struct svrcfstok svrcfstok_t;
 


------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H