Commit 2887df13 authored Apr 29, 2008 by Jan Kara Committed by Theodore Ts'o Apr 29, 2008

ext4: Fix hang on umount with quotas when journal is aborted



Call dquot_drop() from ext4_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 <jack@suse.cz>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
CC: Payphone LIOU <lioupayphone@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

parent 53b7e9f6

fs/ext4/super.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -3040,8 +3040,14 @@ static int ext4_dquot_drop(struct inode *inode)

		/* We may delete quota structure so we need to reserve enough blocks */
		handle = ext4_journal_start(inode, 2*EXT4_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 = ext4_journal_stop(handle);
		if (!ret)