diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-08-01 15:01:06 -0400 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2013-08-01 23:25:38 +0200 |
| commit | a91de85247dfa74a3f8a161e24ce21f23432cbda (patch) | |
| tree | 965544f4ebc9f5503e6e5b3f30db0bb47bd8b01a /fs | |
| parent | e729eac6f65e11c5f03b09adcc84bd5bcb230467 (diff) | |
| download | op-kernel-dev-a91de85247dfa74a3f8a161e24ce21f23432cbda.zip op-kernel-dev-a91de85247dfa74a3f8a161e24ce21f23432cbda.tar.gz | |
jbd: 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.
Backport of jbd2 commit 3ca841c106fd6cd2c942985977a5d126434a8dd6
("jbd2: relocate assert after state lock in journal_commit_transaction()")
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jbd/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 11bb11f..bb217dc 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c @@ -340,13 +340,13 @@ void 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_jbd_start_commit(journal, commit_transaction); jbd_debug(1, "JBD: starting commit of transaction %d\n", commit_transaction->t_tid); spin_lock(&journal->j_state_lock); + J_ASSERT(commit_transaction->t_state == T_RUNNING); commit_transaction->t_state = T_LOCKED; trace_jbd_commit_locking(journal, commit_transaction); |
