[SSI] openssi/kernel/fs fs-writeback.c,1.11,1.12

Update of /cvsroot/ssic-linux/openssi/kernel/fs
In directory vz-cvs-3.sog:/tmp/cvs-serv3919/fs

Modified Files:
      Tag: OPENSSI-FC
	fs-writeback.c 
Log Message:
cfs_writeback_inodes: remove redundant nr_to_write test.


Index: fs-writeback.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/fs/fs-writeback.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fs-writeback.c	24 Mar 2009 04:26:29 -0000	1.11
+++ fs-writeback.c	16 Nov 2011 07:55:10 -0000	1.12
@@ -430,8 +430,6 @@
 
 int cfs_writeback_inodes(struct super_block *sb, struct writeback_control *wbc)
 {
-	if (wbc->nr_to_write <= 0)
-		return 0;
 	if (cfs_sb_is_cfs(sb) && sbtocmi(sb) && CFS_AT_SERVER_SB(sb)) {
 		struct super_block *psb = sbtocmi(sb)->mi_pfs_sb;
 #ifdef NOTYET
@@ -474,7 +472,7 @@
 {
 	struct super_block *sb;
 #ifdef CONFIG_CFS
-	int wb_cfs = 0;	/* Try to flush all PFS first */
+	int wb_cfs = 0; /* always flush stacked FS first */
 #endif
 
 	might_sleep();
@@ -492,7 +490,12 @@
 			if (__writeback_inodes(sb, wbc, 0))
 				goto restart;
 		}
-#else
+		if (wbc->nr_to_write <= 0)
+			break;
+	}
+	if (wbc->nr_to_write > 0 && !wb_cfs++)
+		goto restart;
+#else /* CONFIG_CFS */
 		if (!list_empty(&sb->s_dirty) || !list_empty(&sb->s_io)) {
 			/* we're making our own get_super here */
 			sb->s_count++;
@@ -514,14 +517,10 @@
 			if (__put_super_and_need_restart(sb))
 				goto restart;
 		}
-#endif /* !CONFIG_CFS */
 		if (wbc->nr_to_write <= 0)
 			break;
 	}
-#ifdef CONFIG_CFS
-	if (wbc->nr_to_write > 0 && !wb_cfs++)
-		goto restart;
-#endif
+#endif /* !CONFIG_CFS */
 	spin_unlock(&sb_lock);
 }
 


------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1