[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20251114190002.3311679-3-pasha.tatashin@soleen.com>
Date: Fri, 14 Nov 2025 13:59:51 -0500
From: Pasha Tatashin <pasha.tatashin@...een.com>
To: akpm@...ux-foundation.org,
bhe@...hat.com,
pasha.tatashin@...een.com,
rppt@...nel.org,
jasonmiu@...gle.com,
arnd@...db.de,
coxu@...hat.com,
dave@...ilevsky.ca,
ebiggers@...gle.com,
graf@...zon.com,
kees@...nel.org,
linux-kernel@...r.kernel.org,
kexec@...ts.infradead.org,
linux-mm@...ck.org
Subject: [PATCH v2 02/13] 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.
Signed-off-by: Pasha Tatashin <pasha.tatashin@...een.com>
Reviewed-by: Pratyush Yadav <pratyush@...nel.org>
Reviewed-by: Mike Rapoport (Microsoft) <rppt@...nel.org>
---
kernel/liveupdate/kexec_handover.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c
index 6ad45e12f53b..bc7f046a1313 100644
--- a/kernel/liveupdate/kexec_handover.c
+++ b/kernel/liveupdate/kexec_handover.c
@@ -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);
--
2.52.0.rc1.455.g30608eb744-goog
Powered by blists - more mailing lists