Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
Date:   Wed, 16 Mar 2022 23:00:12 +0100 (CET)
From:   Richard Weinberger <richard@nod.at>
To:     libaokun <libaokun1@huawei.com>
Cc:     linux-mtd <linux-mtd@lists.infradead.org>,
        linux-kernel <linux-kernel@vger.kernel.org>,
        yukuai3 <yukuai3@huawei.com>,
        chengzhihao1 <chengzhihao1@huawei.com>
Message-ID: <157336576.152785.1647468012272.JavaMail.zimbra@nod.at>
In-Reply-To: <dc55e8b3-7d22-6024-374d-4ed126e18c42@huawei.com>
References: <20220215040736.2839939-1-libaokun1@huawei.com> <dc55e8b3-7d22-6024-374d-4ed126e18c42@huawei.com>
Subject: Re: [PATCH -next] ubifs: rename_whiteout: correct old_dir size
 computing
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8BIT
Thread-Topic: ubifs: rename_whiteout: correct old_dir size computing
Thread-Index: qEsEa6jzfGu0qBp13jytxNkZcU+ggw==
Precedence: bulk

----- Ursprüngliche Mail -----
> Von: "libaokun" <libaokun1@huawei.com>
> An: "richard" <richard@nod.at>, "linux-mtd" <linux-mtd@lists.infradead.org>, "linux-kernel"
> <linux-kernel@vger.kernel.org>
> CC: "yukuai3" <yukuai3@huawei.com>, "chengzhihao1" <chengzhihao1@huawei.com>, "libaokun" <libaokun1@huawei.com>
> Gesendet: Donnerstag, 10. März 2022 09:32:57
> Betreff: Re: [PATCH -next] ubifs: rename_whiteout: correct old_dir size computing

> A gentle ping, sorry for the noise.

I have to say sorry for the day.
Thanks for your patience with me.
 
> 
> 在 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 <chengzhihao1@huawei.com>
>> Signed-off-by: Baokun Li <libaokun1@huawei.com>
>> ---
>>   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));

So you basically reset old_sz back to 0?

Thanks,
//richard