From 2845495dcfba8d5902258a64c8c9745b7f535066 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Fri, 21 Dec 2012 00:15:51 -0500
Subject: [PATCH] --- yaml --- r: 348101 b: refs/heads/master c:
 d7961c7fa4d2e3c3f12be67e21ba8799b5a7238a h: refs/heads/master i:   348099:
 8918e02076d5096891a86141e171677e4860314b v: v3

---
 [refs]                      | 2 +-
 trunk/fs/jbd2/transaction.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7f04080c621e..169010344b44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 261cb20cb2f0737a247aaf08dff7eb065e3e5b66
+refs/heads/master: d7961c7fa4d2e3c3f12be67e21ba8799b5a7238a
diff --git a/trunk/fs/jbd2/transaction.c b/trunk/fs/jbd2/transaction.c
index deffd945c8e2..cd4485db42b3 100644
--- a/trunk/fs/jbd2/transaction.c
+++ b/trunk/fs/jbd2/transaction.c
@@ -209,7 +209,8 @@ static int start_this_handle(journal_t *journal, handle_t *handle,
 		if (!new_transaction)
 			goto alloc_transaction;
 		write_lock(&journal->j_state_lock);
-		if (!journal->j_running_transaction) {
+		if (!journal->j_running_transaction &&
+		    !journal->j_barrier_count) {
 			jbd2_get_transaction(journal, new_transaction);
 			new_transaction = NULL;
 		}