]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-event: increase n_enabled_child_sources just once
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 10 Nov 2020 11:57:34 +0000 (12:57 +0100)
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>
Wed, 10 Mar 2021 11:41:30 +0000 (12:41 +0100)
Neither source_child_pidfd_register() nor event_make_signal_data() look at
n_enabled_child_sources.

(cherry picked from commit ac9f2640cb9c107b43f47bba7e068d3b92b5337b)

Related: #1819868

src/libsystemd/sd-event/sd-event.c

index 0cfba8fb39030fad137e62241d32a6ee2c9fc8d6..d18ce28a92dd3f20cdc2962802541d4fbac4ab39 100644 (file)
@@ -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;