diff --git a/[refs] b/[refs] index 272d6f9b9812..bd33a70d25fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3723ca3874a8fc2218c4726d57e3a7da9e83e47 +refs/heads/master: 772279c5f1dceb58d451dca94b557fd89b1ce890 diff --git a/trunk/fs/jbd/commit.c b/trunk/fs/jbd/commit.c index cd931ef1f000..5a8ca61498ca 100644 --- a/trunk/fs/jbd/commit.c +++ b/trunk/fs/jbd/commit.c @@ -470,7 +470,9 @@ void 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); J_ASSERT(commit_transaction->t_nr_buffers <= commit_transaction->t_outstanding_credits);