diff --git a/[refs] b/[refs]
index 071e26d3c6fa..29b6ea3a84ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 519deca0496a4df07d15acf3181ca5d573bffdec
+refs/heads/master: 02c471cb17203c748e9bc87003052c1f46e5df69
diff --git a/trunk/fs/jbd2/commit.c b/trunk/fs/jbd2/commit.c
index e0139786f717..4d99685fdce4 100644
--- a/trunk/fs/jbd2/commit.c
+++ b/trunk/fs/jbd2/commit.c
@@ -560,7 +560,9 @@ void jbd2_journal_commit_transaction(journal_t *journal)
 	 * transaction!  Now comes the tricky part: we need to write out
 	 * metadata.  Loop over the transaction's entire buffer list:
 	 */
+	spin_lock(&journal->j_state_lock);
 	commit_transaction->t_state = T_COMMIT;
+	spin_unlock(&journal->j_state_lock);
 
 	stats.u.run.rs_logging = jiffies;
 	stats.u.run.rs_flushing = jbd2_time_diff(stats.u.run.rs_flushing,