From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 25 Nov 2013 21:20:57 +0000 (+0100)
Subject: service: fix handling of PID file inotify events
X-Git-Tag: v209~1299
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e14c280244fc07a19d0acab2f08c9f783458af34;p=elogind.git

service: fix handling of PID file inotify events
---

diff --git a/src/core/service.c b/src/core/service.c
index e408338b1..28b1465c1 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2916,7 +2916,12 @@ static int service_demand_pid_file(Service *s) {
 }
 
 static int service_dispatch_io(sd_event_source *source, int fd, uint32_t events, void *userdata) {
-        Service *s = SERVICE(userdata);
+        PathSpec *p = userdata;
+        Service *s;
+
+        assert(p);
+
+        s = SERVICE(p->unit);
 
         assert(s);
         assert(fd >= 0);
@@ -2926,7 +2931,7 @@ static int service_dispatch_io(sd_event_source *source, int fd, uint32_t events,
 
         log_debug_unit(UNIT(s)->id, "inotify event for %s", UNIT(s)->id);
 
-        if (path_spec_fd_event(s->pid_file_pathspec, events) < 0)
+        if (path_spec_fd_event(p, events) < 0)
                 goto fail;
 
         if (service_retry_pid_file(s) == 0)