From: Jan Kara Date: Mon, 28 Apr 2008 09:16:23 +0000 (-0700) Subject: reiserfs: fix hang on umount with quotas when journal is aborted X-Git-Tag: v2.6.26-rc1~733 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2fe594fa3732298947377409b5d8111b14f56ec;p=linux-2.6 reiserfs: fix hang on umount with quotas when journal is aborted Call dquot_drop() from reiserfs_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. Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index f8f9a473e6..a4c9770a60 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c @@ -1890,8 +1890,14 @@ static int reiserfs_dquot_drop(struct inode *inode) ret = journal_begin(&th, inode->i_sb, 2 * REISERFS_QUOTA_DEL_BLOCKS(inode->i_sb)); - if (ret) + if (ret) { + /* + * We call dquot_drop() anyway to at least release references + * to quota structures so that umount does not hang. + */ + dquot_drop(inode); goto out; + } ret = dquot_drop(inode); err = journal_end(&th, inode->i_sb,