diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-06-12 22:46:35 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2013-06-12 22:46:35 -0400 |
| commit | 3ca841c106fd6cd2c942985977a5d126434a8dd6 (patch) | |
| tree | f576fe21df51f8120af54dbc4cc953e9418702fc | |
| parent | 4418e14112e3ca85e8492a4489a3552b0cc526a8 (diff) | |
| download | linux-3ca841c106fd6cd2c942985977a5d126434a8dd6.tar.bz2 | |
jbd2: relocate assert after state lock in journal_commit_transaction()
The state lock is taken after we are doing an assert on the state
value, not before. So we might in fact be doing an assert on a
transient value. Ensure the state check is within the scope of
the state lock being taken.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
| -rw-r--r-- | fs/jbd2/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index cfbce48adc0b..44b429126258 100644 --- a/fs/jbd2/commit.c +++ b/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); |