Re: [PATCH -next] ubifs: rename_whiteout: correct old_dir size computing

From: Richard Weinberger
Date: Wed Mar 16 2022 - 18:00:19 EST


----- Ursprüngliche Mail -----
> Von: "libaokun" <libaokun1@xxxxxxxxxx>
> An: "richard" <richard@xxxxxx>, "linux-mtd" <linux-mtd@xxxxxxxxxxxxxxxxxxx>, "linux-kernel"
> <linux-kernel@xxxxxxxxxxxxxxx>
> CC: "yukuai3" <yukuai3@xxxxxxxxxx>, "chengzhihao1" <chengzhihao1@xxxxxxxxxx>, "libaokun" <libaokun1@xxxxxxxxxx>
> 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@xxxxxxxxxx>
>> Signed-off-by: Baokun Li <libaokun1@xxxxxxxxxx>
>> ---
>> 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