From patchwork Tue Jan 10 18:12:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 135276 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E1127B6FC9 for ; Wed, 11 Jan 2012 05:13:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756276Ab2AJSNW (ORCPT ); Tue, 10 Jan 2012 13:13:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9999 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755839Ab2AJSNV (ORCPT ); Tue, 10 Jan 2012 13:13:21 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q0AICvAi016001 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 10 Jan 2012 13:12:57 -0500 Received: from localhost.localdomain.com (vpn-8-221.rdu.redhat.com [10.11.8.221]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q0AICugo006154; Tue, 10 Jan 2012 13:12:56 -0500 From: Josef Bacik To: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, jack@suse.cz Subject: [PATCH] jbd: clear b_modified before moving the jh to a different transaction Date: Tue, 10 Jan 2012 13:12:55 -0500 Message-Id: <1326219175-4529-1-git-send-email-josef@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org If we are journalling data (ie journal=data or big symlinks) we can discard buffers and move them to different transactions to make sure they get cleaned up properly. The problem is b_modified could still be set from the last transaction that touched it, so putting it on the currently running transaction or setting it up to be put on the next transaction will run into problems if the buffer gets reused in that transaction as the space accounting logic won't be done, which will result in panics at commit time because t_nr_buffers will end up being more than t_outstanding_credits. Thanks to Jan Kara for pointing out the other part of this problem a few months ago. Thanks, Signed-off-by: Josef Bacik --- fs/jbd/transaction.c | 5 ++++- fs/jbd2/transaction.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 7e59c6e..c968788 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c @@ -1784,6 +1784,7 @@ static int __dispose_buffer(struct journal_head *jh, transaction_t *transaction) */ clear_buffer_dirty(bh); __journal_file_buffer(jh, transaction, BJ_Forget); + jh->b_modified = 0; may_free = 0; } else { JBUFFER_TRACE(jh, "on running transaction"); @@ -1952,8 +1953,10 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh) * clear dirty bits when it is done with the buffer. */ set_buffer_freed(bh); - if (journal->j_running_transaction && buffer_jbddirty(bh)) + if (journal->j_running_transaction && buffer_jbddirty(bh)) { + jh->b_modified = 0; jh->b_next_transaction = journal->j_running_transaction; + } journal_put_journal_head(jh); spin_unlock(&journal->j_list_lock); jbd_unlock_bh_state(bh); diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index a0e41a4..094dcd8 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -1756,6 +1756,7 @@ static int __dispose_buffer(struct journal_head *jh, transaction_t *transaction) * __journal_file_buffer */ clear_buffer_dirty(bh); + jh->b_modified = 0; __jbd2_journal_file_buffer(jh, transaction, BJ_Forget); may_free = 0; } else { @@ -1917,8 +1918,10 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh) * clear dirty bits when it is done with the buffer. */ set_buffer_freed(bh); - if (journal->j_running_transaction && buffer_jbddirty(bh)) + if (journal->j_running_transaction && buffer_jbddirty(bh)) { + jh->b_modified = 0; jh->b_next_transaction = journal->j_running_transaction; + } jbd2_journal_put_journal_head(jh); spin_unlock(&journal->j_list_lock); jbd_unlock_bh_state(bh);