[PATCH] Revert "UBUNTU: SAUCE: ext4: fix directory index node split corruption"
Danilo Krummrich
danilokrummrich at dk-develop.de
Tue Sep 7 14:43:06 UTC 2021
This reverts commit 31b2a17da83046fbfde0277ba21c49c0663193c3.
Already fixed by commit ffcc845ec245
("ext4: fix potential htree corruption when growing large_dir directories")
BugLink: https://bugs.launchpad.net/bugs/1942902
Signed-off-by: Danilo Krummrich <danilokrummrich at dk-develop.de>
---
fs/ext4/namei.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 24e718fb334f..e3bc05b0c7ae 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2428,15 +2428,13 @@ static int ext4_dx_add_entry(handle_t *handle, struct ext4_filename *fname,
goto journal_error;
}
}
- if (!restart) {
- de = do_split(handle, dir, &bh, frame, &fname->hinfo);
- if (IS_ERR(de)) {
- err = PTR_ERR(de);
- goto cleanup;
- }
- err = add_dirent_to_buf(handle, fname, dir, inode, de, bh);
+ de = do_split(handle, dir, &bh, frame, &fname->hinfo);
+ if (IS_ERR(de)) {
+ err = PTR_ERR(de);
goto cleanup;
}
+ err = add_dirent_to_buf(handle, fname, dir, inode, de, bh);
+ goto cleanup;
journal_error:
ext4_std_error(dir->i_sb, err); /* this is a no-op if err == 0 */
--
2.33.0
More information about the kernel-team
mailing list