Hi,
On 2025-09-13 14:15:14 +0200, Thorsten Blum wrote:
> The goto label 'successful_load' isn't really necessary. Set 'res = 1'
> immediately and let 'goto done' handle the rest.
>
> No functional changes.
>
> Signed-off-by: Thorsten Blum <thorsten.blum@xxxxxxxxx>
> ---
> init/do_mounts_rd.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
> index ac021ae6e6fa..97ddcdaba893 100644
> --- a/init/do_mounts_rd.c
> +++ b/init/do_mounts_rd.c
> @@ -210,7 +210,7 @@ int __init rd_load_image(char *from)
>
> if (nblocks == 0) {
> if (crd_load(decompressor) == 0)
> - goto successful_load;
> + res = 1; /* load successful */
> goto done;
> }
This is now the only place where res will be set to 1.
>
> @@ -264,8 +264,6 @@ int __init rd_load_image(char *from)
> }
> pr_cont("done.\n");
>
> -successful_load:
> - res = 1;
This does not seem correct? After this patch res is not updated to 1 anymore
if execution reaches here without taking another goto, i.e. the return
value is changed by this patch.
Regards,
Klara Modin
> done:
> fput(in_file);
> noclose_input:
> --
> 2.51.0
>
