ubifs: rename_whiteout: correct old_dir size computing

commit 52ac01b6809960cf3c337a8d802500ac9de8c24e upstream.

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: 34c2d4c9ed99667 ("ubifs: Implement RENAME_WHITEOUT")
Reported-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Baokun Li <libaokun1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 7ae48f273febde9f85cafec2c4c151f759c6078e..79e371bc15e1ea3c3333a5b1ebd37b1ac92429ff 100644 (file)
--- 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);