From 433324f3f4983abdb696e942ff52e370083e762c Mon Sep 17 00:00:00 2001
From: Arthur Jones <ajones@riverbed.com>
Date: Thu, 6 Nov 2008 12:53:35 -0800
Subject: [PATCH] --- yaml --- r: 118442 b: refs/heads/master c:
 c87591b719737b4e91eb1a9fa8fd55a4ff1886d6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index afea515922de..a223bfb9be8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbdd12676c83df77480f00ebd32fc98fbe3bf836
+refs/heads/master: c87591b719737b4e91eb1a9fa8fd55a4ff1886d6
diff --git a/trunk/fs/ext3/super.c b/trunk/fs/ext3/super.c
index e5717a4fae67..5dec6d1356c4 100644
--- a/trunk/fs/ext3/super.c
+++ b/trunk/fs/ext3/super.c
@@ -2390,13 +2390,12 @@ static void ext3_write_super (struct super_block * sb)
 
 static int ext3_sync_fs(struct super_block *sb, int wait)
 {
-	tid_t target;
-
 	sb->s_dirt = 0;
-	if (journal_start_commit(EXT3_SB(sb)->s_journal, &target)) {
-		if (wait)
-			log_wait_commit(EXT3_SB(sb)->s_journal, target);
-	}
+	if (wait)
+		ext3_force_commit(sb);
+	else
+		journal_start_commit(EXT3_SB(sb)->s_journal, NULL);
+
 	return 0;
 }