Commit 8c3819f6 authored by Pasha Tatashin's avatar Pasha Tatashin Committed by Andrew Morton
Browse files

kho: convert __kho_abort() to return void 

The internal helper __kho_abort() always returns 0 and has no failure
paths.  Its return value is ignored by __kho_finalize and checked
needlessly by kho_abort.

Change the return type to void to reflect that this function cannot fail,
and simplify kho_abort by removing dead error handling code.

Link: https://lkml.kernel.org/r/20251114190002.3311679-3-pasha.tatashin@soleen.com


Signed-off-by: default avatarPasha Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: default avatarPratyush Yadav <pratyush@kernel.org>
Reviewed-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Cc: Alexander Graf <graf@amazon.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Baoquan He <bhe@redhat.com>
Cc: Coiby Xu <coxu@redhat.com>
Cc: Dave Vasilevsky <dave@vasilevsky.ca>
Cc: Eric Biggers <ebiggers@google.com>
Cc: Kees Cook <kees@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 077a4851

kernel/liveupdate/kexec_handover.c

+2 −9
Original line number Diff line number Diff line
@@ -1117,20 +1117,16 @@ void *kho_restore_vmalloc(const struct kho_vmalloc *preservation) 
}

EXPORT_SYMBOL_GPL(kho_restore_vmalloc);



static int __kho_abort(void)

static void __kho_abort(void)

{

	if (kho_out.preserved_mem_map) {

		kho_mem_ser_free(kho_out.preserved_mem_map);

		kho_out.preserved_mem_map = NULL;

	}



	return 0;

}



int kho_abort(void)

{

	int ret = 0;



	if (!kho_enable)

		return -EOPNOTSUPP;
@@ -1138,10 +1134,7 @@ int kho_abort(void) 
	if (!kho_out.finalized)

		return -ENOENT;



	ret = __kho_abort();

	if (ret)

		return ret;



	__kho_abort();

	kho_out.finalized = false;



	kho_debugfs_fdt_remove(&kho_out.dbg, kho_out.fdt);