lkml.org 
[lkml]   [2019]   [Jun]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 57/60] quota: fix a problem about transfer quota
    Date
    From: yangerkun <yangerkun@huawei.com>

    [ Upstream commit c6d9c35d16f1bafd3fec64b865e569e48cbcb514 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/quota/dquot.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
    index fc20e06c56ba..dd1783ea7003 100644
    --- a/fs/quota/dquot.c
    +++ b/fs/quota/dquot.c
    @@ -1993,8 +1993,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);
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-06-27 02:40    [W:7.067 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site