From: David Tardon <dtardon@redhat.com>
Date: Fri, 3 Nov 2023 13:08:37 +0000 (+0100)
Subject: udev-ctrl: drop the unused maybe_disconnected stuff
X-Git-Tag: v255-rc1~20^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F29847%2Fhead;p=thirdparty%2Fsystemd.git

udev-ctrl: drop the unused maybe_disconnected stuff
---

diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 24ba8231f59..28716347e77 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -37,7 +37,6 @@ struct UdevCtrl {
         socklen_t addrlen;
         bool bound;
         bool connected;
-        bool maybe_disconnected;
         sd_event *event;
         sd_event_source *event_source;
         sd_event_source *event_source_connect;
@@ -291,9 +290,6 @@ int udev_ctrl_send(UdevCtrl *uctrl, UdevCtrlMessageType type, const void *data)
                 .type = type,
         };
 
-        if (uctrl->maybe_disconnected)
-                return -ENOANO; /* to distinguish this from other errors. */
-
         if (type == UDEV_CTRL_SET_ENV) {
                 assert(data);
                 strscpy(ctrl_msg_wire.value.buf, sizeof(ctrl_msg_wire.value.buf), data);
@@ -309,9 +305,6 @@ int udev_ctrl_send(UdevCtrl *uctrl, UdevCtrlMessageType type, const void *data)
         if (send(uctrl->sock, &ctrl_msg_wire, sizeof(ctrl_msg_wire), 0) < 0)
                 return -errno;
 
-        if (type == UDEV_CTRL_EXIT)
-                uctrl->maybe_disconnected = true;
-
         return 0;
 }
 
@@ -326,11 +319,9 @@ int udev_ctrl_wait(UdevCtrl *uctrl, usec_t timeout) {
         if (!uctrl->connected)
                 return 0;
 
-        if (!uctrl->maybe_disconnected) {
-                r = udev_ctrl_send(uctrl, _UDEV_CTRL_END_MESSAGES, NULL);
-                if (r < 0)
-                        return r;
-        }
+        r = udev_ctrl_send(uctrl, _UDEV_CTRL_END_MESSAGES, NULL);
+        if (r < 0)
+                return r;
 
         if (timeout == 0)
                 return 0;