diff --git a/[refs] b/[refs]
index 2132f3f5451e..6affdeb4743f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 702a28b1e64be3dc313f5f0ceb6dc95edfbc5e18
+refs/heads/master: 126039256cf164f69d8cfa20f1952d00fa61f52f
diff --git a/trunk/fs/jbd2/commit.c b/trunk/fs/jbd2/commit.c
index 70b2ae1ef281..6bd8005e3d34 100644
--- a/trunk/fs/jbd2/commit.c
+++ b/trunk/fs/jbd2/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)) {
+			__jbd2_journal_file_buffer(jh, commit_transaction,
+						BJ_Locked);
+			jbd_unlock_bh_state(bh);
+			put_bh(bh);
+		} else {
 			BUFFER_TRACE(bh, "writeout complete: unfile");
 			__jbd2_journal_unfile_buffer(jh);
 			jbd_unlock_bh_state(bh);