Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp1495080pxp; Thu, 10 Mar 2022 06:35:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJznrJ7wRTSHKbLTizPUPmlSmc5voZZiwxbGgYUoiQLZ10Ut6q0x56fzqKRbgz9TxaGq8lv7 X-Received: by 2002:a17:907:334c:b0:6cd:76b7:3948 with SMTP id yr12-20020a170907334c00b006cd76b73948mr4925818ejb.55.1646922943382; Thu, 10 Mar 2022 06:35:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646922943; cv=none; d=google.com; s=arc-20160816; b=UK41JovVviiPwWPIzrY3ngj6RBhi8+Lu6zv2REoKON6GwUjyG6ZOZDJ/90ZFeuek5d lSIYjbYShCJI49SmYghepla+LI5iuwJT0XRRSSdPo0OKSdzADfj3vphZhddUGh+7aeJD 72BczRLCqjfY3dDaMAW7lAQwxl2Iq2JjivbN/aBdp7JINOzuNIKz3znYqno80k66A91B iNq6dj2ZOXp2N+uDGFgfnuVKjWTO641Rqsz/J3IKVkJkLCD/BinEHRFzPewS98Z0pSNx Wk0M5sMsX8AcLEEQwusmhFE36fcIbS+VbIInmyY7jj383KJzwe/9xynKUj6+b6INQBHE g7TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :mime-version:user-agent:date:message-id:from:references:cc:to :subject; bh=42NcruWV+0NbmppNWmK3+G6biQ0mSpHxtG7pwlq+S+U=; b=CxfQ5nCbU52ex8KRoLlkTAEt5kZuKGvqKEtS/P64qUz0wnhZjIMrBc8aJU49snuRWp Qk75TWz7d0N9BejMf5ASYFuhbNFqgLYPBr+/NVfHZNNAjcquju8DZ3JyKB6y7fYj8+Hl CITp9gTVlRJLAwkJGwTvRo7ByEdoshHuzMr0h3ADzRJaEmHPPn3u/JAqNdCnw+GGTGYt dkjalXqzgnOrdtURgIpG4uQv4EOeyDBQ6PlwSpOqsz+ywGfoEhzLi3PyAl8rDtpvFG4t lw/forNTCaHQC+JqzKPXPo0gkOHeK322nY6KjpgNfrexpZ6327oxXi77Kj9WjPWoscY6 BgWA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j11-20020a05640211cb00b00416a12da179si2735790edw.550.2022.03.10.06.35.20; Thu, 10 Mar 2022 06:35:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240378AbiCJIeU (ORCPT + 99 others); Thu, 10 Mar 2022 03:34:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240370AbiCJIeP (ORCPT ); Thu, 10 Mar 2022 03:34:15 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5CEF5D5F7 for ; Thu, 10 Mar 2022 00:33:13 -0800 (PST) Received: from dggpeml500020.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4KDj0T2C8mz9sYG; Thu, 10 Mar 2022 16:29:29 +0800 (CST) Received: from [10.174.177.174] (10.174.177.174) by dggpeml500020.china.huawei.com (7.185.36.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Thu, 10 Mar 2022 16:33:11 +0800 Subject: Re: [PATCH -next] ubifs: rename_whiteout: correct old_dir size computing To: , , CC: , Zhihao Cheng , Baokun Li References: <20220215040736.2839939-1-libaokun1@huawei.com> From: "libaokun (A)" Message-ID: Date: Thu, 10 Mar 2022 16:32:57 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <20220215040736.2839939-1-libaokun1@huawei.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.177.174] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500020.china.huawei.com (7.185.36.88) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,NICE_REPLY_A, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A gentle ping, sorry for the noise. 在 2022/2/15 12:07, Baokun Li 写道: > When renaming the whiteout file, the old whiteout file is not deleted. > Therefore, we add the old dentry size to the old dir like XFS. > Otherwise, an error may be reported due to `fscki->calc_sz != fscki->size` > in check_indes. > > Fixes: 9e0a1fff8db56ea ("ubifs: Implement RENAME_WHITEOUT") > Reported-by: Zhihao Cheng > Signed-off-by: Baokun Li > --- > fs/ubifs/dir.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c > index ae082a0be2a3..86151889548e 100644 > --- a/fs/ubifs/dir.c > +++ b/fs/ubifs/dir.c > @@ -1402,6 +1402,9 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, > iput(whiteout); > goto out_release; > } > + > + /* Add the old_dentry size to the old_dir size. */ > + old_sz -= CALC_DENT_SIZE(fname_len(&old_nm)); > } > > lock_4_inodes(old_dir, new_dir, new_inode, whiteout); -- With Best Regards, Baokun Li