remove mknod() logic and rely on 'devtmpfs'

[elogind.git] / udev / udevd.c

diff --git a/udev/udevd.c b/udev/udevd.c
index 1e12eb38acce556d8262e039b1273a40af6b3743..6b561977dc84a2f483e02c44e48fa107711a479f 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -398,7 +398,7 @@ out:
        }
 }
 
-static void event_run(struct event *event, bool force)
+static void event_run(struct event *event)
 {
        struct udev_list_node *loop;
 
@@ -423,7 +423,7 @@ static void event_run(struct event *event, bool force)
                return;
        }
 
-       if (!force && children >= children_max) {
+       if (children >= children_max) {
                if (children_max > 1)
                        info(event->udev, "maximum number (%i) of children reached\n", children);
                return;
@@ -573,7 +573,7 @@ static void event_queue_start(struct udev *udev)
                        continue;
                }
 
-               event_run(event, false);
+               event_run(event);
        }
 }
 
@@ -863,11 +863,10 @@ static void static_dev_create_from_modules(struct udev *udev)
                if (sscanf(devno, "%c%u:%u", &type, &maj, &min) != 3)
                        continue;
 
-               /* set sticky bit, so we do not remove the node on module unload */
                if (type == 'c')
-                       mode = 01600|S_IFCHR;
+                       mode = S_IFCHR;
                else if (type == 'b')
-                       mode = 01600|S_IFBLK;
+                       mode = S_IFBLK;
                else
                        continue;