udevd: queue-export - remove retry loop

These retry loops are required where create_path() could race with
delete_path().  But only the main udevd process writes to the queue,
so no races will happen here.

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>

diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c
index 37de67a3d450af509de62a0213d18d6fba8037ee..6109837f7ecc44530dcedf81179083fd19d9e919 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];
 {
        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;
 
        if (state != DEVICE_FAILED && udev_queue_export->failed_count == 0)
                return;


@@ -409,16 +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++;
        case DEVICE_FAILED:
                /* record event in the failed directory */
                udev_queue_export->failed_count++;

-               do {
-                       err = util_create_path(udev, filename);
-                       if (err != 0 && err != -ENOENT)
-                               break;
-                       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:
                break;
 
        case DEVICE_QUEUED: