From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 1 Nov 2018 13:13:57 +0000 (+0900)
Subject: udev-event: make udev_event_new() take exec_delay
X-Git-Tag: v240~392^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f86dc900e93f2819c4d4e048d0b05ab5408a047;p=thirdparty%2Fsystemd.git

udev-event: make udev_event_new() take exec_delay
---

diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index 1285117c32b..60267b70c61 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -82,7 +82,7 @@ int main(int argc, char *argv[]) {
                 goto out;
         }
 
-        assert_se(event = udev_event_new(dev));
+        assert_se(event = udev_event_new(dev, 0));
 
         assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, SIGHUP, SIGCHLD, -1) >= 0);
 
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index a0f6a5daa48..17aaa428420 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -42,7 +42,7 @@ typedef struct Spawn {
         size_t result_len;
 } Spawn;
 
-struct udev_event *udev_event_new(struct udev_device *dev) {
+struct udev_event *udev_event_new(struct udev_device *dev, int exec_delay) {
         struct udev_event *event;
 
         assert(dev);
@@ -54,6 +54,7 @@ struct udev_event *udev_event_new(struct udev_device *dev) {
         *event = (struct udev_event) {
                 .dev = dev,
                 .birth_usec = now(CLOCK_MONOTONIC),
+                .exec_delay = exec_delay,
         };
 
         return event;
diff --git a/src/udev/udev.h b/src/udev/udev.h
index f723dd70674..246f74e6ee3 100644
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -60,7 +60,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 int udev_rules_apply_static_dev_perms(struct udev_rules *rules);
 
 /* udev-event.c */
-struct udev_event *udev_event_new(struct udev_device *dev);
+struct udev_event *udev_event_new(struct udev_device *dev, int exec_delay);
 struct udev_event *udev_event_free(struct udev_event *event);
 ssize_t udev_event_apply_format(struct udev_event *event,
                                 const char *src, char *dest, size_t size,
diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c
index 20f713d738d..df669971848 100644
--- a/src/udev/udevadm-test.c
+++ b/src/udev/udevadm-test.c
@@ -128,7 +128,7 @@ int test_main(int argc, char *argv[], void *userdata) {
         /* don't read info from the db */
         udev_device_set_info_loaded(dev);
 
-        event = udev_event_new(dev);
+        event = udev_event_new(dev, 0);
 
         sigfillset(&mask);
         sigprocmask(SIG_SETMASK, &mask, &sigmask_orig);
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 8391638d34c..9985907e80d 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -409,15 +409,12 @@ static void worker_spawn(Manager *manager, struct event *event) {
                         assert(dev);
 
                         log_debug("seq %llu running", udev_device_get_seqnum(dev));
-                        udev_event = udev_event_new(dev);
-                        if (udev_event == NULL) {
+                        udev_event = udev_event_new(dev, arg_exec_delay);
+                        if (!udev_event) {
                                 r = -ENOMEM;
                                 goto out;
                         }
 
-                        if (arg_exec_delay > 0)
-                                udev_event->exec_delay = arg_exec_delay;
-
                         /*
                          * Take a shared lock on the device node; this establishes
                          * a concept of device "ownership" to serialize device