tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: 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>

authored by

Pasha Tatashin and committed by
Andrew Morton 8c3819f6 077a4851

+2 -9
+2 -9
kernel/liveupdate/kexec_handover.c
··· 1117 1117 } 1118 1118 EXPORT_SYMBOL_GPL(kho_restore_vmalloc); 1119 1119 1120 - static int __kho_abort(void) 1120 + static void __kho_abort(void) 1121 1121 { 1122 1122 if (kho_out.preserved_mem_map) { 1123 1123 kho_mem_ser_free(kho_out.preserved_mem_map); 1124 1124 kho_out.preserved_mem_map = NULL; 1125 1125 } 1126 - 1127 - return 0; 1128 1126 } 1129 1127 1130 1128 int kho_abort(void) 1131 1129 { 1132 - int ret = 0; 1133 - 1134 1130 if (!kho_enable) 1135 1131 return -EOPNOTSUPP; 1136 1132 ··· 1134 1138 if (!kho_out.finalized) 1135 1139 return -ENOENT; 1136 1140 1137 - ret = __kho_abort(); 1138 - if (ret) 1139 - return ret; 1140 - 1141 + __kho_abort(); 1141 1142 kho_out.finalized = false; 1142 1143 1143 1144 kho_debugfs_fdt_remove(&kho_out.dbg, kho_out.fdt);