From 05568c6e3f348f277458e0278413dda022cdd905 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Wed, 12 Jun 2013 22:46:35 -0400 Subject: [PATCH] --- yaml --- r: 377617 b: refs/heads/master c: 3ca841c106fd6cd2c942985977a5d126434a8dd6 h: refs/heads/master i: 377615: 0013b8ce24b7face67934b207303db71fa1c0e55 v: v3 --- [refs] | 2 +- trunk/fs/jbd2/commit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2ac7f3a70719..bf456cf95c30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4418e14112e3ca85e8492a4489a3552b0cc526a8 +refs/heads/master: 3ca841c106fd6cd2c942985977a5d126434a8dd6 diff --git a/trunk/fs/jbd2/commit.c b/trunk/fs/jbd2/commit.c index cfbce48adc0b..44b429126258 100644 --- a/trunk/fs/jbd2/commit.c +++ b/trunk/fs/jbd2/commit.c @@ -427,13 +427,13 @@ void jbd2_journal_commit_transaction(journal_t *journal) J_ASSERT(journal->j_committing_transaction == NULL); commit_transaction = journal->j_running_transaction; - J_ASSERT(commit_transaction->t_state == T_RUNNING); trace_jbd2_start_commit(journal, commit_transaction); jbd_debug(1, "JBD2: starting commit of transaction %d\n", commit_transaction->t_tid); write_lock(&journal->j_state_lock); + J_ASSERT(commit_transaction->t_state == T_RUNNING); commit_transaction->t_state = T_LOCKED; trace_jbd2_commit_locking(journal, commit_transaction);