From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 29 Jan 2019 13:03:29 +0000 (+0100)
Subject: udevd: save the result of devnum or ifindex blocker
X-Git-Tag: v242-rc1~319^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8671411668e9b15bc3dadcb4e48ff43f6a8461d3;p=thirdparty%2Fsystemd.git

udevd: save the result of devnum or ifindex blocker
---

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 79191ffaf1b..2b7775f7240 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -727,7 +727,7 @@ static int is_device_busy(Manager *manager, struct event *event) {
 
                         if (sd_device_get_devnum(loop_event->dev, &d) >= 0 &&
                             devnum == d && is_block == streq(s, "block"))
-                                return true;
+                                goto set_delaying_seqnum;
                 }
 
                 /* check network device ifindex */
@@ -736,7 +736,7 @@ static int is_device_busy(Manager *manager, struct event *event) {
 
                         if (sd_device_get_ifindex(loop_event->dev, &i) >= 0 &&
                             ifindex == i)
-                                return true;
+                                goto set_delaying_seqnum;
                 }
 
                 if (sd_device_get_devpath(loop_event->dev, &loop_devpath) < 0)