Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763632AbYHEBHr (ORCPT ); Mon, 4 Aug 2008 21:07:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758922AbYHEBFa (ORCPT ); Mon, 4 Aug 2008 21:05:30 -0400 Received: from kumera.dghda.com ([80.68.90.171]:4447 "EHLO kumera.dghda.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758958AbYHEBF1 (ORCPT ); Mon, 4 Aug 2008 21:05:27 -0400 From: "Duane Griffin" To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, sct@redhat.com, linux-ext4@vger.kernel.org, Sami Liedes , Duane Griffin Subject: [PATCH] jbd2: abort instead of waiting for nonexistent transactions Date: Tue, 5 Aug 2008 02:05:21 +0100 Message-Id: <1217898321-3514-2-git-send-email-duaneg@dghda.com> X-Mailer: git-send-email 1.5.4.5 In-Reply-To: <1217898321-3514-1-git-send-email-duaneg@dghda.com> References: <1217898321-3514-1-git-send-email-duaneg@dghda.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1882 Lines: 49 The __jbd2_log_wait_for_space function sits in a loop checkpointing transactions until there is sufficient space free in the journal. However, if there are no transactions to be processed (e.g. because the free space calculation is wrong due to a corrupted filesystem) it will never progress. Check for space being required when no transactions are outstanding and abort the journal instead of endlessly looping. This patch fixes the bug reported by Sami Liedes at: http://bugzilla.kernel.org/show_bug.cgi?id=10976 Signed-off-by: Duane Griffin --- diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c index 91389c8..3c075c4 100644 --- a/fs/jbd2/checkpoint.c +++ b/fs/jbd2/checkpoint.c @@ -126,13 +126,24 @@ void __jbd2_log_wait_for_space(journal_t *journal) /* * Test again, another process may have checkpointed while we - * were waiting for the checkpoint lock + * were waiting for the checkpoint lock. If there are no + * outstanding transactions there is nothing to checkpoint and + * we can't make progress. Abort the journal in this case. */ spin_lock(&journal->j_state_lock); nblocks = jbd_space_needed(journal); if (__jbd2_log_space_left(journal) < nblocks) { + int chkpt = journal->j_checkpoint_transactions != NULL; + spin_unlock(&journal->j_state_lock); - jbd2_log_do_checkpoint(journal); + if (chkpt) { + jbd2_log_do_checkpoint(journal); + } else { + printk(KERN_ERR "%s: no transactions\n", + __func__); + jbd2_journal_abort(journal, 0); + } + spin_lock(&journal->j_state_lock); } mutex_unlock(&journal->j_checkpoint_mutex); -- 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/