[SSI] openssi/kernel/cluster/ssi/cfs inode.c,1.69,1.70

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

Modified Files:
      Tag: OPENSSI-FC
	inode.c 
Log Message:
cfs_clear_inode: skip cfs_wb_all(). cfstok_giveback() will flush the data upon REVOKE.


Index: inode.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs/inode.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- inode.c	15 Dec 2010 07:34:04 -0000	1.69
+++ inode.c	15 Dec 2010 08:06:15 -0000	1.70
@@ -265,7 +265,7 @@
 	/*
 	* The following can never actually happen...
 	*/
-	if (cfs_have_writebacks (inode)) {
+	if (unlikely(cfs_have_writebacks(inode))) {
 	printk (KERN_ERR
 	      "cfs_delete_inode: inode %ld has pending RPC requests\n",
 	      inode->i_ino);
@@ -285,7 +285,8 @@
 	struct cnode *cp;
 	struct svrcfstok *hp;
 
-	cfs_wb_all(inode);
+	/* SSI: no need for early writeback. token GIVEBACK will flush data */
+	/* cfs_wb_all(inode); */
 #ifdef SSI_CFS_EXNFS
 	struct rpc_cred *cred = CFS_I(inode)->mm_cred;
 
@@ -722,11 +723,13 @@
  *
  * Used for Remote clients
  */
+#ifndef cfs_fhget
 struct inode *
 cfs_fhget(struct super_block *sb, struct cfsdirok *cdrok)
 {
 	return __cfs_fhget(sb, cdrok, NULL);
 }
+#endif
 
 struct inode *
 __cfs_fhget(struct super_block *sb, struct cfsdirok *cdrok,
@@ -771,11 +774,13 @@
  *
  * Used for Client@server
  */
+#ifndef cfs_hpget
 struct inode *
 cfs_hpget(struct super_block *sb, svrcfstok_t *hp)
 {
 	return __cfs_hpget(sb, hp, NULL);
 }
+#endif
 
 struct inode *
 __cfs_hpget(struct super_block *sb, svrcfstok_t *hp, struct inode *inode)


------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d