From: Baokun Li <libaokun1@huawei.com>
Date: Tue, 15 Feb 2022 04:07:36 +0000 (+0800)
Subject: ubifs: rename_whiteout: correct old_dir size computing
X-Git-Tag: v5.10.110~57
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8a0c70c238c5233b1b55d18162ae20db52daa01c;p=users%2Fdwmw2%2Flinux.git

ubifs: rename_whiteout: correct old_dir size computing

commit 705757274599e2e064dd3054aabc74e8af31a095 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: 9e0a1fff8db56ea ("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 1193f62017b6f..5daffd46369dd 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -1360,6 +1360,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);