summaryrefslogtreecommitdiff
path: root/libudev/libudev-queue-private.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-09-10 02:08:05 +0200
committerKay Sievers <kay.sievers@vrfy.org>2009-09-10 02:08:05 +0200
commitb6a2637524e4b94ba51abcf5ee42f3676c9755ed (patch)
tree99bf9c78ad5309db49f95eb4aa2650f8af56e393 /libudev/libudev-queue-private.c
parent676d294c23cf999ac7d192b058476f91242550c0 (diff)
put util_create_path() and file creastion in a retry loop
On 8/29/09, Florian Zumbiehl <florz@florz.de> wrote: > Could it happen that > util_create_path() and util_delete_path() > do run in parallel for > the same directory? After all, util_create_path() > does handle > the case where creation of the directory happens in parallel > to it running, so it doesn't seem all that unlikely to me ...
Diffstat (limited to 'libudev/libudev-queue-private.c')
-rw-r--r--libudev/libudev-queue-private.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c
index d9f7a67d18..4e67a1f9d0 100644
--- a/libudev/libudev-queue-private.c
+++ b/libudev/libudev-queue-private.c
@@ -45,9 +45,9 @@
#include <fcntl.h>
#include <dirent.h>
#include <limits.h>
+#include <errno.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <assert.h>
#include "libudev.h"
#include "libudev-private.h"
@@ -396,6 +396,7 @@ 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;
@@ -408,10 +409,14 @@ 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++;
- util_create_path(udev, filename);
- udev_selinux_setfscreatecon(udev, filename, S_IFLNK);
- symlink(udev_device_get_devpath(udev_device), filename);
- udev_selinux_resetfscreatecon(udev);
+ 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);
break;
case DEVICE_QUEUED: