summaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2013-04-09 09:21:41 -0400
committerTheodore Ts'o <tytso@mit.edu>2013-04-09 09:21:41 -0400
commitbcb1385096caf421363d47e735acda940cb1e12b (patch)
tree64f43332e262c078b74aedb1d062aec293176b6f /fs/ext4
parente8238f9a8339b3578c85e4192a7a23bc2bdc0333 (diff)
downloadop-kernel-dev-bcb1385096caf421363d47e735acda940cb1e12b.zip
op-kernel-dev-bcb1385096caf421363d47e735acda940cb1e12b.tar.gz
ext4: fix deadlock with quota feature
We didn't mark hidden quota files with S_NOQUOTA flag and thus quota was accounted even for quota files. Thus we could recurse back to quota code when adding new blocks to quota file which can easily deadlock. Mark hidden quota files properly. Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/super.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 525beb6e..968ca93 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4953,6 +4953,8 @@ static int ext4_quota_enable(struct super_block *sb, int type, int format_id,
return PTR_ERR(qf_inode);
}
+ /* Don't account quota for quota files to avoid recursion */
+ qf_inode->i_flags |= S_NOQUOTA;
err = dquot_enable(qf_inode, type, format_id, flags);
iput(qf_inode);
OpenPOWER on IntegriCloud