From d6a8cbe9169c9fe700d64a83eee5698d3f30b8ab Mon Sep 17 00:00:00 2001 From: Baokun Li Date: Tue, 15 Feb 2022 12:07:36 +0800 Subject: [PATCH] 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 Signed-off-by: Baokun Li Signed-off-by: Richard Weinberger Signed-off-by: Greg Kroah-Hartman --- fs/ubifs/dir.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index c49b10c5ae1d..12356dcc3ecb 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -1452,6 +1452,9 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, if (unlink) drop_nlink(old_dir); } + + /* Add the old_dentry size to the old_dir size. */ + old_sz -= CALC_DENT_SIZE(fname_len(&old_nm)); } old_dir->i_size -= old_sz; -- 2.20.1