APPLIED[H]: [PATCH v2 1/2][HIRSUTE] Revert "UBUNTU: SAUCE: ext4: fix directory index node split corruption"

[Stefan Bader]

On 07.09.21 17:25, Danilo Krummrich wrote:
> 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>
> ---

Applied to hirsute:linux/master-next. Thanks.

-Stefan

> v2: updated BugLink to reflect the new bug report number
> ---
>   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 */
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20210922/c4edd0e2/attachment.sig>