Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45679C10F05 for ; Tue, 26 Mar 2019 16:43:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11F7E2075D for ; Tue, 26 Mar 2019 16:43:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731869AbfCZQni (ORCPT ); Tue, 26 Mar 2019 12:43:38 -0400 Received: from mx2.suse.de ([195.135.220.15]:44532 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730537AbfCZQni (ORCPT ); Tue, 26 Mar 2019 12:43:38 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 5D70EB14A; Tue, 26 Mar 2019 16:43:37 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id DCD311E42D1; Tue, 26 Mar 2019 17:43:36 +0100 (CET) Date: Tue, 26 Mar 2019 17:43:36 +0100 From: Jan Kara To: yangerkun Cc: jack@suse.com, yi.zhang@huawei.com, houtao1@huawei.com, miaoxie@huawei.com, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH v2] quota: fix a problem about transfer quota Message-ID: <20190326164336.GA6294@quack2.suse.cz> References: <1553608802-80648-1-git-send-email-yangerkun@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1553608802-80648-1-git-send-email-yangerkun@huawei.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Tue 26-03-19 22:00:02, yangerkun wrote: > 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: 7b9ca4c61("quota: Reduce contention on dq_data_lock") > Signed-off-by: yangerkun Thanks! I've added the fix to my tree. Honza > --- > 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 fc20e06..dd1783e 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.7.4 > > -- Jan Kara SUSE Labs, CR