diff --git a/[refs] b/[refs] index 3676cd2a525b..072eabd3cfe4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1be3a928ee0b0b2a893695e6dd5c5dbe293af16 +refs/heads/master: 39c04153fda8c32e85b51c96eb5511a326ad7609 diff --git a/trunk/fs/jbd2/transaction.c b/trunk/fs/jbd2/transaction.c index dd422e680418..383b0fbc6e19 100644 --- a/trunk/fs/jbd2/transaction.c +++ b/trunk/fs/jbd2/transaction.c @@ -652,10 +652,10 @@ int jbd2__journal_restart(handle_t *handle, int nblocks, gfp_t gfp_mask) } if (atomic_dec_and_test(&transaction->t_updates)) wake_up(&journal->j_wait_updates); + tid = transaction->t_tid; spin_unlock(&transaction->t_handle_lock); jbd_debug(2, "restarting handle %p\n", handle); - tid = transaction->t_tid; need_to_start = !tid_geq(journal->j_commit_request, tid); read_unlock(&journal->j_state_lock); if (need_to_start)