[SSI] openssi/kernel/include/cluster/ssi/cfs cfstok.h,1.16,1.17

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

Modified Files:
      Tag: OPENSSI-FC
	cfstok.h 
Log Message:
CFS:
- Re-enable lockless sct_flags. (#ifdef SVRCFSTOK_SCT_FLAGS_NOLOCK)


Index: cfstok.h
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/include/cluster/ssi/cfs/cfstok.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cfstok.h	27 Oct 2009 03:18:30 -0000	1.16
+++ cfstok.h	17 Dec 2009 05:45:09 -0000	1.17
@@ -387,7 +387,11 @@
 	unsigned long	sct_resv;	/* Cluster active block reservations */
 	LOCK_T sct_mtlock;
 #endif
+#ifdef SVRCFSTOK_SCT_FLAGS_NOLOCK
+	volatile u_long	sct_flags;
+#else
 	u_long	sct_flags;
+#endif
 #ifdef SKIP_NOTYET
 	struct contention *sct_cdata;
 #endif
@@ -410,8 +414,8 @@
 
 #ifdef SVRCFSTOK_SCT_FLAGS_NOLOCK
 /* Bits in sct_flags */
-#define CFS_NOTOKENCACHE	1
-#define CFS_DELAYUNLNK		2	/* file has been renamed */
+#define CFS_NOTOKENCACHE	0
+#define CFS_DELAYUNLNK		1	/* file has been renamed */
 #else
 /* Bit values for sct_flags */
 #define	CFS_NOTOKENCACHE	0x1


------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev