libbudev-private: rename udev_list_entry_get_flag()

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

diff --git a/udev/udev-node.c b/udev/udev-node.c
index 8c2154d37e4b6d35d0c00eac6764d8d363691ab2..23bfade28c572a2c9b2b1ee79338360068b613cb 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 */
+                       utimensat(AT_FDCWD, file, NULL, 0);
                } else {
                        char file_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
 
@@ -175,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);
+                                       utimensat(AT_FDCWD, slink, NULL, AT_SYMLINK_NOFOLLOW);
                                        goto exit;
                                }
                        }
@@ -281,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;
 }
 
@@ -400,7 +405,7 @@ int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid)
 
        /* create/update symlinks, add symlinks to name index */
        udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev)) {
-               if (udev_list_entry_get_flag(list_entry))
+               if (udev_list_entry_get_flags(list_entry))
                        /* simple unmanaged link name */
                        node_symlink(udev, udev_device_get_devnode(dev), udev_list_entry_get_name(list_entry));
                else
@@ -417,10 +422,11 @@ int udev_node_remove(struct udev_device *dev)
        const char *devnode;
        char partitionname[UTIL_PATH_SIZE];
        struct stat stats;
+       struct udev_device *dev_check;
        int err = 0;
        int num;
 
-       /* remove,update symlinks, remove symlinks from name index */
+       /* remove/update symlinks, remove symlinks from name index */
        udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev))
                link_update(dev, udev_list_entry_get_name(list_entry), 0);
 
@@ -436,10 +442,15 @@ int udev_node_remove(struct udev_device *dev)
                return -1;
        }
 
-       info(udev, "removing device node '%s'\n", devnode);
-       err = util_unlink_secure(udev, devnode);
-       if (err)
-               return err;
+       dev_check = udev_device_new_from_syspath(udev, udev_device_get_syspath(dev));
+       if (dev_check != NULL && stats.st_rdev == udev_device_get_devnum(dev_check)) {
+               /* do not remove device node if the same sys-device is re-created in the meantime */
+               info(udev, "keeping device node of existing device'%s'\n", devnode);
+       } else {
+               info(udev, "removing device node '%s'\n", devnode);
+               err = util_unlink_secure(udev, devnode);
+       }
+       udev_device_unref(dev_check);
 
        num = udev_device_get_num_fake_partitions(dev);
        if (num > 0) {