>From 0ab2ad057f96f49ba443f317df8e6368dd76def7 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Fri, 10 Jul 2009 11:56:37 +0200 Subject: [PATCH] jbd2: Clear dirty bit in jbd2_journal_get_create_access() 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. This silences the warning in jbd2_journal_file_buffer() about metadata buffer being dirty. Signed-off-by: Jan Kara --- fs/jbd2/transaction.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 86144aa..0fb7c88 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -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 */ -- 1.6.0.2