diff --git a/[refs] b/[refs]
index fc07ab8393a0..b1f4d96cb948 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d3a25f1fb75206ae8b2b1cdd1431b3852e1a45a
+refs/heads/master: 6f5a9da1af5a8c286575c30c2706dc1fbef9164b
diff --git a/trunk/fs/jbd/commit.c b/trunk/fs/jbd/commit.c
index 10be51290a27..be4648bc7a2f 100644
--- a/trunk/fs/jbd/commit.c
+++ b/trunk/fs/jbd/commit.c
@@ -248,8 +248,12 @@ static void journal_submit_data_buffers(journal_t *journal,
 				bufs = 0;
 				goto write_out_data;
 			}
-		}
-		else {
+		} else if (!locked && buffer_locked(bh)) {
+			__journal_file_buffer(jh, commit_transaction,
+						BJ_Locked);
+			jbd_unlock_bh_state(bh);
+			put_bh(bh);
+		} else {
 			BUFFER_TRACE(bh, "writeout complete: unfile");
 			__journal_unfile_buffer(jh);
 			jbd_unlock_bh_state(bh);