From 99cde098f892de0ff11947fa5e7d309da274b111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 18 Mar 2020 16:36:14 +0100 Subject: [PATCH] bus: drop dead code for kdbus support sd_bus_try_close() always returns -EOPNOTSUPP if bus is a valid object. It nevers returns -EBUSY. So we'd always go into the "fallback" path. --- src/shared/bus-util.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 8e6a6e2ce2..4b0a3a3e31 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -115,36 +115,16 @@ int bus_event_loop_with_idle( return r; if (r == 0 && !exiting && idle) { + /* Inform the service manager that we are going down, so that it will queue all + * further start requests, instead of assuming we are already running. */ + sd_notify(false, "STOPPING=1"); - r = sd_bus_try_close(bus); - if (r == -EBUSY) - continue; - - /* Fallback for dbus1 connections: we - * unregister the name and wait for the - * response to come through for it */ - if (r == -EOPNOTSUPP) { - - /* Inform the service manager that we - * are going down, so that it will - * queue all further start requests, - * instead of assuming we are already - * running. */ - sd_notify(false, "STOPPING=1"); - - r = bus_async_unregister_and_exit(e, bus, name); - if (r < 0) - return r; - - exiting = true; - continue; - } - + r = bus_async_unregister_and_exit(e, bus, name); if (r < 0) return r; - sd_event_exit(e, 0); - break; + exiting = true; + continue; } }