summaryrefslogtreecommitdiffstats
path: root/fs/quota
diff options
context:
space:
mode:
authoryangerkun <yangerkun@huawei.com>2019-03-26 22:00:02 +0800
committerJan Kara <jack@suse.cz>2019-06-19 15:25:41 +0200
commitc6d9c35d16f1bafd3fec64b865e569e48cbcb514 (patch)
treef53abf2d04fac8a1e17aa32330830a788ee3f279 /fs/quota
parentbed3c0d84e7e25c8e0964d297794f4c215b01f33 (diff)
downloadlinux-stable-c6d9c35d16f1bafd3fec64b865e569e48cbcb514.tar.gz
linux-stable-c6d9c35d16f1bafd3fec64b865e569e48cbcb514.tar.bz2
linux-stable-c6d9c35d16f1bafd3fec64b865e569e48cbcb514.zip
quota: fix a problem about transfer quota
Run below script as root, dquot_add_space will return -EDQUOT since __dquot_transfer call dquot_add_space with flags=0, and dquot_add_space think it's a preallocation. Fix it by set flags as DQUOT_SPACE_WARN. mkfs.ext4 -O quota,project /dev/vdb mount -o prjquota /dev/vdb /mnt setquota -P 23 1 1 0 0 /dev/vdb dd if=/dev/zero of=/mnt/test-file bs=4K count=1 chattr -p 23 test-file Fixes: 7b9ca4c61bc2 ("quota: Reduce contention on dq_data_lock") Signed-off-by: yangerkun <yangerkun@huawei.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/quota')
-rw-r--r--fs/quota/dquot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 9ad72ea7f71f..58f15a083dd1 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -1996,8 +1996,8 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to)
&warn_to[cnt]);
if (ret)
goto over_quota;
- ret = dquot_add_space(transfer_to[cnt], cur_space, rsv_space, 0,
- &warn_to[cnt]);
+ ret = dquot_add_space(transfer_to[cnt], cur_space, rsv_space,
+ DQUOT_SPACE_WARN, &warn_to[cnt]);
if (ret) {
spin_lock(&transfer_to[cnt]->dq_dqb_lock);
dquot_decr_inodes(transfer_to[cnt], inode_usage);