diff --git a/[refs] b/[refs]
index 7fbe75a3a4db..f6055d94c68f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 667eff35a1f56fa74ce98a0c7c29a40adc1ba4e3
+refs/heads/master: 229309caebe4508d650bb6d8f7d51f2b116f5bbd
diff --git a/trunk/fs/jbd2/commit.c b/trunk/fs/jbd2/commit.c
index 6e28000a4b21..78c299218681 100644
--- a/trunk/fs/jbd2/commit.c
+++ b/trunk/fs/jbd2/commit.c
@@ -760,8 +760,13 @@ void jbd2_journal_commit_transaction(journal_t *journal)
                    required. */
 		JBUFFER_TRACE(jh, "file as BJ_Forget");
 		jbd2_journal_file_buffer(jh, commit_transaction, BJ_Forget);
-		/* Wake up any transactions which were waiting for this
-		   IO to complete */
+		/*
+		 * Wake up any transactions which were waiting for this IO to
+		 * complete. The barrier must be here so that changes by
+		 * jbd2_journal_file_buffer() take effect before wake_up_bit()
+		 * does the waitqueue check.
+		 */
+		smp_mb();
 		wake_up_bit(&bh->b_state, BH_Unshadow);
 		JBUFFER_TRACE(jh, "brelse shadowed buffer");
 		__brelse(bh);