Skip to contentSkip to conversation

jbd2: Clear dirty bit in jbd2_journal_get_create_access() and __dispose_buffer()

PATCH In review Jan Kara 2 participants 2 messages Jul 13, 2009 Journalling layer for block devices (JBD2)

lore
Share & tools
lore

Jan Kara

author
#0 lore raw

PATCH 1/1 jbd2: Clear dirty bit in jbd2_journal_get_create_access() and __dispose_buffer()

In case we reallocate previously freed buffer, it can happen that the buffer we reallocate is dirty (jbd2_journal_forget() got called while the previous transaction was still committing). At the time we reallocate the buffer, the transaction freeing the buffer must be already committed so we can just remove the dirty bit.
We also change __dispose_buffer() to first clear the dirty bit and only
after that file the buffer into BJ_Forget list.
These two changes silence the warning in jbd2_journal_file_buffer() about
metadata buffer being dirty.

---
 fs/jbd2/transaction.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

Ted, this is the new fix I was talking about and should replace the fix
"jbd2: Clear dirty bit in jbd2_journal_get_create_access()". It makes sence to fold it into the patch "jbd2: Fix a race between checkpointing code and journal_get_write_access()" which is what I did for JBD but that's upto you.

Honza

fs/jbd2/transaction.c +15 -1
index 86144aa..6213ac7 100644
@@ -826,6 +826,15 @@ int jbd2_journal_get_create_access(handle_t *handle, struct buffer_head *bh)
 	J_ASSERT_JH(jh, buffer_locked(jh2bh(jh)));
 
 	if (jh->b_transaction == NULL) {
+		/*
+		 * Previous jbd2_journal_forget() could have left the buffer
+		 * with jbddirty bit set because it was being committed. When
+		 * the commit finished, we've filed the buffer for
+		 * checkpointing and marked it dirty. Now we are reallocating
+		 * the buffer so the transaction freeing it must have
+		 * committed and so it's safe to clear the dirty bit.
+		 */
+		clear_buffer_dirty(jh2bh(jh));
 		jh->b_transaction = transaction;
 
 		/* first access by this transaction */
@@ -1627,8 +1636,13 @@ static int __dispose_buffer(struct journal_head *jh, transaction_t *transaction)
 
 	if (jh->b_cp_transaction) {
 		JBUFFER_TRACE(jh, "on running+cp transaction");
+		/*
+		 * We don't want to write the buffer anymore, clear the
+		 * bit so that we don't confuse checks in
+		 * __journal_file_buffer
+		 */
+		clear_buffer_dirty(bh);
 		__jbd2_journal_file_buffer(jh, transaction, BJ_Forget);
-		clear_buffer_jbddirty(bh);
 		may_free = 0;
 	} else {
 		JBUFFER_TRACE(jh, "on running transaction");
Signature · 1 line
1.6.0.2
maintainer
#1 lore raw
Quoted 5 lines · Jan Kara

Ted, this is the new fix I was talking about and should replace the fix
"jbd2: Clear dirty bit in jbd2_journal_get_create_access()". It makes sence to fold it into the patch "jbd2: Fix a race between checkpointing code and journal_get_write_access()" which is what I did for JBD but that's upto you.

Thanks, that's what I've done in the ext4 patch queue; I've folded this patch into "jbd2: Fix a race between checkpointing code and journal_get_write_access()".

- Ted