admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

kho: convert __kho_abort() to return void

Browse Source 
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: Pasha Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: Pratyush Yadav <pratyush@kernel.org>
Reviewed-by: Mike 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: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Pasha Tatashin
2025-11-14 13:59:51 -05:00
committed by Andrew Morton
parent 077a4851b0
commit 8c3819f627
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/liveupdate/kexec_handover.c
View File

@@ -1117,20 +1117,16 @@ err_free_pages_array:
}
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);