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

[libaokun (A)]

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 <chengzhihao1 at huawei.com>
> Signed-off-by: Baokun Li <libaokun1 at 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));
>   	}
>   
>   	lock_4_inodes(old_dir, new_dir, new_inode, whiteout);

-- 
With Best Regards,
Baokun Li