Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965617AbXHGVRt (ORCPT ); Tue, 7 Aug 2007 17:17:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759432AbXHGUzS (ORCPT ); Tue, 7 Aug 2007 16:55:18 -0400 Received: from pentafluge.infradead.org ([213.146.154.40]:59726 "EHLO pentafluge.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935348AbXHGUzO (ORCPT ); Tue, 7 Aug 2007 16:55:14 -0400 Date: Tue, 7 Aug 2007 13:48:01 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org, torvalds@linux-foundation.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, dev@openvz.org, jack@suse.cz, linux-ext4@vger.kernel.org Subject: [2.6.22.2 review 59/84] jbd2 commit: fix transaction dropping Message-ID: <20070807204801.GI23028@kroah.com> References: <20070807204034.882009319@mini.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="jbd2-commit-fix-transaction-dropping.patch" In-Reply-To: <20070807204157.GA23028@kroah.com> User-Agent: Mutt/1.5.15 (2007-04-06) X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1182 Lines: 36 From: Jan Kara We have to check that also the second checkpoint list is non-empty before dropping the transaction. Signed-off-by: Jan Kara Cc: Chuck Ebbert Cc: Kirill Korotaev Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- fs/jbd2/commit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -896,7 +896,8 @@ restart_loop: journal->j_committing_transaction = NULL; spin_unlock(&journal->j_state_lock); - if (commit_transaction->t_checkpoint_list == NULL) { + if (commit_transaction->t_checkpoint_list == NULL && + commit_transaction->t_checkpoint_io_list == NULL) { __jbd2_journal_drop_transaction(journal, commit_transaction); } else { if (journal->j_checkpoint_transactions == NULL) { -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/