[SSI] openssi/kernel/include/cluster/ssi/cfs cfs_fs_i.h, 1.18, 1.19 cfs_page.h, 1.10, 1.11

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

Modified Files:
      Tag: OPENSSI-FC
	cfs_fs_i.h cfs_page.h 
Log Message:
CFS:
- Split __cfs_lock() into do_getlk(), do_unlk(), and do_setlk().
- Flush data before unlocking. (#ifdef CFS_ZAP_CACHES)
- Fix VFS lock out of sync with server; take two. (#ifdef CFS_MIRROR_LOCK_WAIT)
- Fix VFS lock out of sync with server when interrupted. (#ifdef CFS_FLOCK)
- Comment out unused CXLOCK and related macros.
- Comment out unused in struct cnode.
- Data handlers to use GFP_NOFS flag.


Index: cfs_fs_i.h
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/include/cluster/ssi/cfs/cfs_fs_i.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- cfs_fs_i.h	27 Oct 2009 03:18:30 -0000	1.18
+++ cfs_fs_i.h	2 Nov 2009 03:44:37 -0000	1.19
@@ -80,7 +80,7 @@
 	 *
 	 *	mtime != read_cache_mtime
 	 */
-#ifdef CFS_ZAP_CACHES
+#if defined(CFS_ZAP_CACHES) && defined(CFS_FILE_RW_NOLOCK)
 	unsigned long		read_cache_jiffies;
 	unsigned long		attrtimeo;
 	unsigned long		attrtimeo_timestamp;
@@ -122,16 +122,26 @@
 				ncommit,
 				npages;
 
+#ifdef SSI_CFS_EXNFS
 	/* Credentials for shared mmap */
 	struct rpc_cred		*mm_cred;
+#endif
 
+#ifdef SSI_CFS_SKIP
+#ifdef SKIP
 	int		c_lastcookie;	/* last readdir cookie */
+#endif
 	long		c_owner;	/* proc index for locker of cnode */
 	long		c_count;	/* number of cnode locks for c_owner */
+#ifdef SKIP
 	long		c_lwpid;	/* lwp id of locker of cnode */
+#endif
 	CONDITION_T	c_cxlock;	/* Synch structure */
-	int		c_rw_excl;	/* RW locked exclusively */
 #ifdef SKIP
+	int		c_rw_excl;	/* RW locked exclusively */
+#endif
+#endif /* SSI_CFS_SKIP */
+#ifdef SSI_CFS_FULLTIMES
 	struct fattr	c_attr;		/* cached inode attributes */
 #endif
 	/* Set of tokens present for this cnode. */
@@ -265,6 +275,7 @@
 #define	ctofh(cnode)	(&((cnode)->c_fh))
 #define	itocfh(inode)	(ctofh(itoc(inode)))
 
+#ifdef SSI_CFS_SKIP
 /*
  * Lock and unlock cnodes.
  */
@@ -330,5 +341,6 @@
 		UNLOCK_COND_LOCK(&(cp)->c_statelock);\
 	NSC_SWAPUNLOCK(); \
 } while (0)
+#endif /* SSI_CFS_SKIP */
 
 #endif	/* !_SSI_CFS_CNODE_H */

Index: cfs_page.h
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/include/cluster/ssi/cfs/cfs_page.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cfs_page.h	27 Oct 2009 03:18:30 -0000	1.10
+++ cfs_page.h	2 Nov 2009 03:44:37 -0000	1.11
@@ -69,7 +69,9 @@
 #define CFS_NEED_COMMIT(req)	(test_bit(PG_NEED_COMMIT,&(req)->wb_flags))
 #define CFS_NEED_RESCHED(req)	(test_bit(PG_NEED_RESCHED,&(req)->wb_flags))
 #endif
+#ifndef CFS_ASYNC_QUEUE
 #define CFS_REQ_DOWN(req)	(test_bit(PG_DOWN,&(req)->wb_flags))
+#endif
 
 extern	struct cfs_page *cfs_create_request(struct file *, struct inode *,
 					    struct page *,
@@ -201,6 +203,7 @@
 	return (((loff_t)req->wb_index) << PAGE_CACHE_SHIFT) + req->wb_offset;
 }
 
+#ifndef CFS_ASYNC_QUEUE
 /*
  * Mark a page being on the down list
  */
@@ -219,4 +222,5 @@
 	clear_bit(PG_DOWN, &req->wb_flags);
 	smp_mb__after_clear_bit();
 }
+#endif /* !CFS_ASYNC_QUEUE */
 #endif /* _LINUX_CFS_PAGE_H */


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference