Speed up udev_enumerate_scan_*

[elogind.git] / udev / udev-node.c

diff --git a/udev/udev-node.c b/udev/udev-node.c
index 39bec3e166ba9cc5f9be49324df28b36c9396ec8..c80a74c2188128eb20478f4d137b0b89855975da 100644 (file)
--- a/udev/udev-node.c
+++ b/udev/udev-node.c
@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <grp.h>
 #include <dirent.h>
+#include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -55,6 +56,8 @@ int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mod
                        info(udev, "preserve file '%s', because it has correct dev_t\n", file);
                        preserve = 1;
                        udev_selinux_lsetfilecon(udev, file, mode);
+                       /* update time stamp when we re-use the node, like on media change events */
+                       utimes(file, NULL);
                } else {
                        char file_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
 
@@ -78,13 +81,15 @@ int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mod
        } else {
                info(udev, "mknod(%s, %#o, (%u,%u))\n", file, mode, major(devnum), minor(devnum));
                do {
-                       util_create_path(udev, file);
+                       err = util_create_path(udev, file);
+                       if (err != 0 && err != -ENOENT)
+                               break;
                        udev_selinux_setfscreatecon(udev, file, mode);
                        err = mknod(file, mode, devnum);
                        if (err != 0)
-                               err = errno;
+                               err = -errno;
                        udev_selinux_resetfscreatecon(udev);
-               } while (err == ENOENT);
+               } while (err == -ENOENT);
                if (err != 0) {
                        err(udev, "mknod(%s, %#o, (%u,%u) failed: %m\n", file, mode, major(devnum), minor(devnum));
                        goto exit;
@@ -173,6 +178,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
                                        info(udev, "preserve already existing symlink '%s' to '%s'\n",
                                             slink, target);
                                        udev_selinux_lsetfilecon(udev, slink, S_IFLNK);
+                                       lutimes(slink, NULL);
                                        goto exit;
                                }
                        }
@@ -180,13 +186,15 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
        } else {
                info(udev, "creating symlink '%s' to '%s'\n", slink, target);
                do {
-                       util_create_path(udev, slink);
+                       err = util_create_path(udev, slink);
+                       if (err != 0 && err != -ENOENT)
+                               break;
                        udev_selinux_setfscreatecon(udev, slink, S_IFLNK);
                        err = symlink(target, slink);
                        if (err != 0)
-                               err = errno;
+                               err = -errno;
                        udev_selinux_resetfscreatecon(udev);
-               } while (err == ENOENT);
+               } while (err == -ENOENT);
                if (err == 0)
                        goto exit;
        }
@@ -195,13 +203,15 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
        util_strscpyl(slink_tmp, sizeof(slink_tmp), slink, TMP_FILE_EXT, NULL);
        unlink(slink_tmp);
        do {
-               util_create_path(udev, slink);
-               udev_selinux_setfscreatecon(udev, slink, S_IFLNK);
+               err = util_create_path(udev, slink_tmp);
+               if (err != 0 && err != -ENOENT)
+                       break;
+               udev_selinux_setfscreatecon(udev, slink_tmp, S_IFLNK);
                err = symlink(target, slink_tmp);
                if (err != 0)
-                       err = errno;
+                       err = -errno;
                udev_selinux_resetfscreatecon(udev);
-       } while (err == ENOENT);
+       } while (err == -ENOENT);
        if (err != 0) {
                err(udev, "symlink(%s, %s) failed: %m\n", target, slink_tmp);
                goto exit;
@@ -275,6 +285,7 @@ static const char *link_find_prioritized(struct udev_device *dev, bool add, cons
                        udev_device_unref(dev_db);
                }
        }
+       closedir(dir);
        return target;
 }
 
@@ -313,11 +324,17 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
        }
 
        if (add) {
+               int err;
+
                dbg(udev, "creating index: '%s'\n", filename);
                do {
-                       util_create_path(udev, filename);
-                       symlink(udev_device_get_devpath(dev), filename);
-               } while (errno == ENOENT);
+                       err = util_create_path(udev, filename);
+                       if (err != 0 && err != -ENOENT)
+                               break;
+                       err = symlink(udev_device_get_devpath(dev), filename);
+                       if (err != 0)
+                               err = -errno;
+               } while (err == -ENOENT);
        }
 }