From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 1 Jul 2021 06:57:23 +0000 (+0200)
Subject: Merge pull request #20030 from keszybz/exec_fd-event-source
X-Git-Tag: v249-rc3~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9faf12110a3b64445fa82a79a902ed2f5941a02a;p=thirdparty%2Fsystemd.git

Merge pull request #20030 from keszybz/exec_fd-event-source

exec_fd event source rework
---

9faf12110a3b64445fa82a79a902ed2f5941a02a
diff --cc src/core/mount.c
index ee4dd0eea19,2a91ad76f93..053deac14db
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@@ -266,9 -231,27 +266,9 @@@ static void mount_done(Unit *u) 
  
          mount_unwatch_control_pid(m);
  
-         m->timer_event_source = sd_event_source_unref(m->timer_event_source);
+         m->timer_event_source = sd_event_source_disable_unref(m->timer_event_source);
  }
  
 -static MountParameters* get_mount_parameters_fragment(Mount *m) {
 -        assert(m);
 -
 -        if (m->from_fragment)
 -                return &m->parameters_fragment;
 -
 -        return NULL;
 -}
 -
 -static MountParameters* get_mount_parameters(Mount *m) {
 -        assert(m);
 -
 -        if (m->from_proc_self_mountinfo)
 -                return &m->parameters_proc_self_mountinfo;
 -
 -        return get_mount_parameters_fragment(m);
 -}
 -
  static int update_parameters_proc_self_mountinfo(
                  Mount *m,
                  const char *what,
diff --cc src/libsystemd/sd-event/sd-event.c
index cc9d9f5d9bc,bdf812ee32b..e9199deb418
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@@ -2970,10 -2993,11 +2976,11 @@@ static int event_arm_timer
  
          if (!d->needs_rearm)
                  return 0;
 -        else
 -                d->needs_rearm = false;
 +
 +        d->needs_rearm = false;
  
          a = prioq_peek(d->earliest);
+         assert(!a || EVENT_SOURCE_USES_TIME_PRIOQ(a->type));
          if (!a || a->enabled == SD_EVENT_OFF || time_event_source_next(a) == USEC_INFINITY) {
  
                  if (d->fd < 0)