[SSI] openssi/kernel/cluster/ssi/cfs cfstok.c,1.28,1.29

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

Modified Files:
      Tag: OPENSSI-FC
	cfstok.c 
Log Message:
cfstok_objrevoke: use cfs_wb_all() instead so that there is a re-flush if server fails halfway through a flush.


Index: cfstok.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs/cfstok.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- cfstok.c	15 Dec 2010 07:31:36 -0000	1.28
+++ cfstok.c	15 Dec 2010 08:08:33 -0000	1.29
@@ -1704,16 +1704,8 @@
 			if (S_ISREG(ip->i_mode) &&
 			    mapping_writably_mapped(ip->i_mapping))
 				unmap_mapping_range(ip->i_mapping, 0, 0, 0);
-			if (oldmode != CFSTOK_SR &&
-			    ip->i_mapping->nrpages) {
-				error = filemap_flush(ip->i_mapping);
-				if (error != -EIO) {
-					int err2 = filemap_fdatawait(
-								ip->i_mapping);
-					if (!error)
-						error = err2;
-				}
-			}
+			if (oldmode != CFSTOK_SR && ip->i_mapping->nrpages)
+				error = cfs_wb_all(ip);
 			if (newmode == CFSTOK_SR)
 				break;
 			invalidate_inode_pages2(ip->i_mapping);


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