summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-11-10 12:57:34 +0100
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>2021-03-10 12:41:30 +0100
commit188465c472996b426a1f22a9fc46d031b722c3b4 (patch)
tree12b95ce6650487529bc761a8d831bb8d451fac71
parentdeb9e6ad3a1d7cfbc3b53d1e74cda6ae398a90fd (diff)
downloadsystemd-188465c472996b426a1f22a9fc46d031b722c3b4.tar.gz
sd-event: increase n_enabled_child_sources just once
Neither source_child_pidfd_register() nor event_make_signal_data() look at n_enabled_child_sources. (cherry picked from commit ac9f2640cb9c107b43f47bba7e068d3b92b5337b) Related: #1819868
-rw-r--r--src/libsystemd/sd-event/sd-event.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 0cfba8fb39..d18ce28a92 100644
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -2383,8 +2383,6 @@ static int event_source_enable(sd_event_source *s, int enable) {
break;
case SOURCE_CHILD:
- s->event->n_enabled_child_sources++;
-
r = event_make_signal_data(s->event, SIGCHLD, NULL);
if (r < 0) {
s->enabled = SD_EVENT_OFF;
@@ -2393,6 +2391,7 @@ static int event_source_enable(sd_event_source *s, int enable) {
return r;
}
+ s->event->n_enabled_child_sources++;
break;