From: Jan Kara Subject: [PATCH] ext3: Fix hang on umount with quotas when journal is aborted Date: Wed, 2 Apr 2008 11:04:51 +0200 Message-ID: <20080402090451.GC2716@duck.suse.cz> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Payphone LIOU , linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org To: Andrew Morton Return-path: Received: from styx.suse.cz ([82.119.242.94]:58215 "EHLO mail.suse.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750706AbYDBJEy (ORCPT ); Wed, 2 Apr 2008 05:04:54 -0400 Content-Disposition: inline Sender: linux-ext4-owner@vger.kernel.org List-ID: Call dquot_drop() from ext3_dquot_drop() even if we fail to start a transaction. Otherwise we never get to dropping references to quota structures from the inode and umount will hang indefinitely. Thanks to Payphone LIOU for spotting the problem. Signed-off-by: Jan Kara CC: Payphone LIOU --- fs/ext3/super.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/fs/ext3/super.c b/fs/ext3/super.c index ad53606..77e9702 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c @@ -2639,8 +2639,14 @@ static int ext3_dquot_drop(struct inode *inode) /* We may delete quota structure so we need to reserve enough blocks */ handle = ext3_journal_start(inode, 2*EXT3_QUOTA_DEL_BLOCKS(inode->i_sb)); - if (IS_ERR(handle)) + if (IS_ERR(handle)) { + /* + * We call dquot_drop() anyway to at least release references + * to quota structures so that umount does not hang. + */ + dquot_drop(inode); return PTR_ERR(handle); + } ret = dquot_drop(inode); err = ext3_journal_stop(handle); if (!ret) -- 1.5.2.4