From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 26 Jan 2011 01:55:35 +0000 (+0100)
Subject: automount: use unit_pending_inactive() where appropriate
X-Git-Tag: v18~62
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=5d909e3ec3f502f1d33d0070d8a7a5755e7615d8;ds=sidebyside

automount: use unit_pending_inactive() where appropriate
---

diff --git a/src/automount.c b/src/automount.c
index 0ae467cbd..9447c0d8f 100644
--- a/src/automount.c
+++ b/src/automount.c
@@ -573,7 +573,8 @@ static void automount_enter_runnning(Automount *a) {
 
         /* We don't take mount requests anymore if we are supposed to
          * shut down anyway */
-        if (a->meta.job && a->meta.job->type == JOB_STOP) {
+        if (unit_pending_inactive(UNIT(a))) {
+                log_debug("Suppressing automount request on %s since unit stop is scheduled.", a->meta.id);
                 automount_send_ready(a, -EHOSTDOWN);
                 return;
         }
diff --git a/src/socket.c b/src/socket.c
index 4443dba0c..e386c7f29 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -1189,6 +1189,8 @@ static void socket_enter_running(Socket *s, int cfd) {
         /* We don't take connections anymore if we are supposed to
          * shut down anyway */
         if (unit_pending_inactive(UNIT(s))) {
+                log_debug("Suppressing connection request on %s since unit stop is scheduled.", s->meta.id);
+
                 if (cfd >= 0)
                         close_nointr_nofail(cfd);
                 else  {