libudev: allow to get list of all available sysfs attrs for a device

[elogind.git] / libudev / libudev-queue-private.c

diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c
index 4e67a1f9d05ae2503ab43b5860c92fcd4c2e7ab7..06dc2f5e0e9bcce06ee81c0bd04b608f39f83d5c 100644 (file)
--- a/libudev/libudev-queue-private.c
+++ b/libudev/libudev-queue-private.c
@@ -396,7 +396,6 @@ static void update_failed(struct udev_queue_export *udev_queue_export,
 {
        struct udev *udev = udev_device_get_udev(udev_device);
        char filename[UTIL_PATH_SIZE];
-       int err;
 
        if (state != DEVICE_FAILED && udev_queue_export->failed_count == 0)
                return;
@@ -409,14 +408,10 @@ static void update_failed(struct udev_queue_export *udev_queue_export,
        case DEVICE_FAILED:
                /* record event in the failed directory */
                udev_queue_export->failed_count++;
-               do {
-                       util_create_path(udev, filename);
-                       udev_selinux_setfscreatecon(udev, filename, S_IFLNK);
-                       err = symlink(udev_device_get_devpath(udev_device), filename);
-                       if (err != 0)
-                               err = errno;
-                       udev_selinux_resetfscreatecon(udev);
-               } while (err == ENOENT);
+               util_create_path(udev, filename);
+               udev_selinux_setfscreatecon(udev, filename, S_IFLNK);
+               symlink(udev_device_get_devpath(udev_device), filename);
+               udev_selinux_resetfscreatecon(udev);
                break;
 
        case DEVICE_QUEUED:
@@ -428,17 +423,6 @@ static void update_failed(struct udev_queue_export *udev_queue_export,
                break;
 
        case DEVICE_FINISHED:
-               if (udev_device_get_sysname_old(udev_device) != NULL &&
-                   strcmp(udev_device_get_sysname_old(udev_device), udev_device_get_sysname(udev_device)) != 0) {
-                       /* "move" event - rename failed file to current name, do not delete failed */
-                       char filename_old[UTIL_PATH_SIZE];
-
-                       util_strscpyl(filename_old, sizeof(filename_old), udev_get_dev_path(udev), "/.udev/failed/",
-                                     udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname_old(udev_device), NULL);
-                       if (rename(filename_old, filename) == 0)
-                               info(udev, "renamed devpath, moved failed state of '%s' to %s'\n",
-                                    udev_device_get_devpath_old(udev_device), udev_device_get_devpath(udev_device));
-               }
                break;
        }