diff options
| author | Baokun Li <libaokun1@huawei.com> | 2022-02-15 05:07:36 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2022-03-17 23:34:07 +0100 |
| commit | 705757274599e2e064dd3054aabc74e8af31a095 (patch) | |
| tree | a3bc3784e6143ca51dd561bc8868e543b2bfc284 /fs/ubifs/dir.c | |
| parent | jffs2: fix memory leak in jffs2_scan_medium (diff) | |
| download | linux-705757274599e2e064dd3054aabc74e8af31a095.tar.xz linux-705757274599e2e064dd3054aabc74e8af31a095.zip | |
ubifs: rename_whiteout: correct old_dir size computing
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>
Diffstat (limited to 'fs/ubifs/dir.c')
| -rw-r--r-- | fs/ubifs/dir.c | 3 |
1 files changed, 3 insertions, 0 deletions
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); |