mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
[PATCH] Prevent race condition in jbd
Subject: Prevent race condition in jbd This patch from Stephen Tweedie which fixes a race in jbd code (it demonstrated itself as more or less random NULL dereferences in the journal code). Acked-by: Jan Kara <jack@suse.cz> Acked-by: Chris Mason <mason@suse.com> Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
4a0d7ce02b
commit
90aa130583
1 changed files with 3 additions and 3 deletions
|
@ -1775,10 +1775,10 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh)
|
|||
JBUFFER_TRACE(jh, "checkpointed: add to BJ_Forget");
|
||||
ret = __dispose_buffer(jh,
|
||||
journal->j_running_transaction);
|
||||
journal_put_journal_head(jh);
|
||||
spin_unlock(&journal->j_list_lock);
|
||||
jbd_unlock_bh_state(bh);
|
||||
spin_unlock(&journal->j_state_lock);
|
||||
journal_put_journal_head(jh);
|
||||
return ret;
|
||||
} else {
|
||||
/* There is no currently-running transaction. So the
|
||||
|
@ -1789,10 +1789,10 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh)
|
|||
JBUFFER_TRACE(jh, "give to committing trans");
|
||||
ret = __dispose_buffer(jh,
|
||||
journal->j_committing_transaction);
|
||||
journal_put_journal_head(jh);
|
||||
spin_unlock(&journal->j_list_lock);
|
||||
jbd_unlock_bh_state(bh);
|
||||
spin_unlock(&journal->j_state_lock);
|
||||
journal_put_journal_head(jh);
|
||||
return ret;
|
||||
} else {
|
||||
/* The orphan record's transaction has
|
||||
|
@ -1813,10 +1813,10 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh)
|
|||
journal->j_running_transaction);
|
||||
jh->b_next_transaction = NULL;
|
||||
}
|
||||
journal_put_journal_head(jh);
|
||||
spin_unlock(&journal->j_list_lock);
|
||||
jbd_unlock_bh_state(bh);
|
||||
spin_unlock(&journal->j_state_lock);
|
||||
journal_put_journal_head(jh);
|
||||
return 0;
|
||||
} else {
|
||||
/* Good, the buffer belongs to the running transaction.
|
||||
|
|
Loading…
Reference in a new issue