From 459e03260bf43453bcab940063e47f9534298d38 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 28 Jan 2008 23:58:27 -0500 Subject: [PATCH] --- yaml --- r: 77895 b: refs/heads/master c: f5a7a6b0d9b6af7d46124ed3f6b3995225cb62d0 h: refs/heads/master i: 77893: 143e980d98ca3b825bb8fd0696b137faf19682f9 77891: d230c3fa52f9999800bfcb69bddd53c5ef4387ca 77887: d53ca2ea01eb2b7b0508b15875b569d95c649be8 v: v3 --- [refs] | 2 +- trunk/fs/jbd2/checkpoint.c | 12 ++++++------ trunk/fs/jbd2/commit.c | 8 ++++---- trunk/include/linux/jbd2.h | 2 ++ 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 52e99874acf5..0c170c35c7da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36df53f4a3e445175fc1e9d7f433599482ec6d7f +refs/heads/master: f5a7a6b0d9b6af7d46124ed3f6b3995225cb62d0 diff --git a/trunk/fs/jbd2/checkpoint.c b/trunk/fs/jbd2/checkpoint.c index 3fccde7ba008..7e958c86242f 100644 --- a/trunk/fs/jbd2/checkpoint.c +++ b/trunk/fs/jbd2/checkpoint.c @@ -602,15 +602,15 @@ int __jbd2_journal_remove_checkpoint(struct journal_head *jh) /* * There is one special case to worry about: if we have just pulled the - * buffer off a committing transaction's forget list, then even if the - * checkpoint list is empty, the transaction obviously cannot be - * dropped! + * buffer off a running or committing transaction's checkpoing list, + * then even if the checkpoint list is empty, the transaction obviously + * cannot be dropped! * - * The locking here around j_committing_transaction is a bit sleazy. + * The locking here around t_state is a bit sleazy. * See the comment at the end of jbd2_journal_commit_transaction(). */ - if (transaction == journal->j_committing_transaction) { - JBUFFER_TRACE(jh, "belongs to committing transaction"); + if (transaction->t_state != T_FINISHED) { + JBUFFER_TRACE(jh, "belongs to running/committing transaction"); goto out; } diff --git a/trunk/fs/jbd2/commit.c b/trunk/fs/jbd2/commit.c index 6986f334c643..39b5cee3dd8a 100644 --- a/trunk/fs/jbd2/commit.c +++ b/trunk/fs/jbd2/commit.c @@ -867,10 +867,10 @@ void jbd2_journal_commit_transaction(journal_t *journal) } spin_unlock(&journal->j_list_lock); /* - * This is a bit sleazy. We borrow j_list_lock to protect - * journal->j_committing_transaction in __jbd2_journal_remove_checkpoint. - * Really, __jbd2_journal_remove_checkpoint should be using j_state_lock but - * it's a bit hassle to hold that across __jbd2_journal_remove_checkpoint + * This is a bit sleazy. We use j_list_lock to protect transition + * of a transaction into T_FINISHED state and calling + * __jbd2_journal_drop_transaction(). Otherwise we could race with + * other checkpointing code processing the transaction... */ spin_lock(&journal->j_state_lock); spin_lock(&journal->j_list_lock); diff --git a/trunk/include/linux/jbd2.h b/trunk/include/linux/jbd2.h index d5f7cff4cb28..d861ffd49821 100644 --- a/trunk/include/linux/jbd2.h +++ b/trunk/include/linux/jbd2.h @@ -442,6 +442,8 @@ struct transaction_s /* * Transaction's current state * [no locking - only kjournald2 alters this] + * [j_list_lock] guards transition of a transaction into T_FINISHED + * state and subsequent call of __jbd2_journal_drop_transaction() * FIXME: needs barriers * KLUDGE: [use j_state_lock] */