diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-03-15 21:12:40 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-03-17 14:42:56 +0900 |
| commit | 42670846427c3e00288c1e14afb305965234e51f (patch) | |
| tree | 712c4ea5991900882252a936d6fa85191a2fa9fb /src/udev/udev-ctrl.c | |
| parent | da29de23ef200b17bb780e5a0efb6cff28c72287 (diff) | |
| download | systemd-42670846427c3e00288c1e14afb305965234e51f.tar.gz | |
Revert "udev: do not kill "udevadm control" process in the same cgroup"
This reverts commit ccadf9ac0d6d206767294b3f96f41eb42b48d1b0.
The fix is not insufficient. See #22686.
Diffstat (limited to 'src/udev/udev-ctrl.c')
| -rw-r--r-- | src/udev/udev-ctrl.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c index 2b697c03b3..8adef47732 100644 --- a/src/udev/udev-ctrl.c +++ b/src/udev/udev-ctrl.c @@ -12,7 +12,6 @@ #include "alloc-util.h" #include "errno-util.h" -#include "event-util.h" #include "fd-util.h" #include "format-util.h" #include "io-util.h" @@ -106,13 +105,6 @@ static void udev_ctrl_disconnect(UdevCtrl *uctrl) { uctrl->sock_connect = safe_close(uctrl->sock_connect); } -int udev_ctrl_is_connected(UdevCtrl *uctrl) { - if (!uctrl) - return false; - - return event_source_is_enabled(uctrl->event_source_connect); -} - static UdevCtrl *udev_ctrl_free(UdevCtrl *uctrl) { assert(uctrl); @@ -314,8 +306,6 @@ int udev_ctrl_send(UdevCtrl *uctrl, UdevCtrlMessageType type, const void *data) strscpy(ctrl_msg_wire.value.buf, sizeof(ctrl_msg_wire.value.buf), data); } else if (IN_SET(type, UDEV_CTRL_SET_LOG_LEVEL, UDEV_CTRL_SET_CHILDREN_MAX)) ctrl_msg_wire.value.intval = PTR_TO_INT(data); - else if (type == UDEV_CTRL_SENDER_PID) - ctrl_msg_wire.value.pid = PTR_TO_PID(data); if (!uctrl->connected) { if (connect(uctrl->sock, &uctrl->saddr.sa, uctrl->addrlen) < 0) |