---

yaml --- r: 348101 b: refs/heads/master c: d7961c7 h: refs/heads/master i: 348099: 8918e02 v: v3
git-mirror · Dec 21, 2012 · 2845495 · 2845495
1 parent fe9a94d
commit 2845495
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;
 		}