mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 08:14:15 +08:00
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>
This commit is contained in:
parent
53b7e9f680
commit
2887df139c
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user