From df6287051f9361817a13c358bd262dbda84c3d96 Mon Sep 17 00:00:00 2001
From: Adrian Hunter <ext-adrian.hunter@nokia.com>
Date: Thu, 29 Jan 2009 11:17:24 +0200
Subject: [PATCH] --- yaml --- r: 130861 b: refs/heads/master c:
 3eb14297c4b85af0c5e6605e18d93b6031330d71 h: refs/heads/master i:   130859:
 9a20f339bafb3c75bfaf4cc2efbed1bca08c5a76 v: v3

---
 [refs]                 |  2 +-
 trunk/fs/ubifs/super.c | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 145d7a185fc8..7f00b83439ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a29d2005b0f28d018d36d209c47f3973a725df5
+refs/heads/master: 3eb14297c4b85af0c5e6605e18d93b6031330d71
diff --git a/trunk/fs/ubifs/super.c b/trunk/fs/ubifs/super.c
index dbfc88714716..3ddd754262b4 100644
--- a/trunk/fs/ubifs/super.c
+++ b/trunk/fs/ubifs/super.c
@@ -450,16 +450,6 @@ static int ubifs_sync_fs(struct super_block *sb, int wait)
 	if (sb->s_flags & MS_RDONLY)
 		return 0;
 
-	/*
-	 * Synchronize write buffers, because 'ubifs_run_commit()' does not
-	 * do this if it waits for an already running commit.
-	 */
-	for (i = 0; i < c->jhead_cnt; i++) {
-		err = ubifs_wbuf_sync(&c->jheads[i].wbuf);
-		if (err)
-			return err;
-	}
-
 	/*
 	 * VFS calls '->sync_fs()' before synchronizing all dirty inodes and
 	 * pages, so synchronize them first, then commit the journal. Strictly
@@ -471,6 +461,16 @@ static int ubifs_sync_fs(struct super_block *sb, int wait)
 	 */
 	generic_sync_sb_inodes(sb, &wbc);
 
+	/*
+	 * Synchronize write buffers, because 'ubifs_run_commit()' does not
+	 * do this if it waits for an already running commit.
+	 */
+	for (i = 0; i < c->jhead_cnt; i++) {
+		err = ubifs_wbuf_sync(&c->jheads[i].wbuf);
+		if (err)
+			return err;
+	}
+
 	err = ubifs_run_commit(c);
 	if (err)
 		return err;