X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=eb311dfba72e7e5e7ce29b0fd2c9d21c785b819a;hp=69572c6268789a896603f3b302d65439219fe2f8;hb=091b42826c3bbcac309cc97207e5dc438e33ef00;hpb=254d6d3ca2188a396706b363d0840431d360fbd9 diff --git a/udevd.c b/udevd.c index 69572c626..eb311dfba 100644 --- a/udevd.c +++ b/udevd.c @@ -130,6 +130,7 @@ static int udev_event_process(struct udevd_uevent_msg *msg) return -1; strlcpy(udev->action, msg->action, sizeof(udev->action)); sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem, msg->driver); + udev->devpath_old = msg->devpath_old; udev->devt = msg->devt; retval = udev_device_event(&rules, udev); @@ -153,66 +154,65 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st char filename[PATH_SIZE]; char filename_failed[PATH_SIZE]; size_t start; - struct udevd_uevent_msg *loop_msg; - int fd; - /* add location of queue files */ - strlcpy(filename, udev_root, sizeof(filename)); - strlcat(filename, "/", sizeof(filename)); - start = strlcat(filename, EVENT_QUEUE_DIR"/", sizeof(filename)); - strlcat(filename, msg->devpath, sizeof(filename)); - path_encode(&filename[start], sizeof(filename) - start); + /* location of queue file */ + snprintf(filename, sizeof(filename), "%s/"EVENT_QUEUE_DIR"/%llu", udev_root, msg->seqnum); - /* add location of failed files */ + /* location of failed file */ strlcpy(filename_failed, udev_root, sizeof(filename_failed)); strlcat(filename_failed, "/", sizeof(filename_failed)); start = strlcat(filename_failed, EVENT_FAILED_DIR"/", sizeof(filename_failed)); strlcat(filename_failed, msg->devpath, sizeof(filename_failed)); - path_encode(&filename_failed[start], sizeof(filename) - start); + path_encode(&filename_failed[start], sizeof(filename_failed) - start); switch (state) { case EVENT_QUEUED: unlink(filename_failed); delete_path(filename_failed); + create_path(filename); - fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644); - if (fd > 0) - close(fd); - return; + symlink(msg->devpath, filename); + break; case EVENT_FINISHED: - case EVENT_FAILED: - unlink(filename_failed); - delete_path(filename_failed); - - /* don't remove, if events for the same path are still pending */ - list_for_each_entry(loop_msg, &running_list, node) - if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0) - return; - - list_for_each_entry(loop_msg, &exec_list, node) - if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0) - return; - - /* move failed events to the failed directory */ - if (state == EVENT_FAILED) { - create_path(filename_failed); - rename(filename, filename_failed); + if (msg->devpath_old != NULL) { + /* "move" event - rename failed file to current name, do not delete failed */ + char filename_failed_old[PATH_SIZE]; + + strlcpy(filename_failed_old, udev_root, sizeof(filename_failed_old)); + strlcat(filename_failed_old, "/", sizeof(filename_failed_old)); + start = strlcat(filename_failed_old, EVENT_FAILED_DIR"/", sizeof(filename_failed_old)); + strlcat(filename_failed_old, msg->devpath_old, sizeof(filename_failed_old)); + path_encode(&filename_failed_old[start], sizeof(filename) - start); + + if (rename(filename_failed_old, filename_failed) == 0) + info("renamed devpath, moved failed state of '%s' to %s'", + msg->devpath_old, msg->devpath); } else { - unlink(filename); + unlink(filename_failed); + delete_path(filename_failed); } - /* clean up the queue directory */ + unlink(filename); delete_path(filename); + break; + case EVENT_FAILED: + /* move failed event to the failed directory */ + create_path(filename_failed); + rename(filename, filename_failed); - return; + /* clean up possibly empty queue directory */ + delete_path(filename); + break; } + + return; } static void msg_queue_delete(struct udevd_uevent_msg *msg) { list_del(&msg->node); - /* mark as failed, if add event returns non-zero */ + /* mark as failed, if "add" event returns non-zero */ if (msg->exitstatus && strcmp(msg->action, "add") == 0) export_event_state(msg, EVENT_FAILED); else @@ -280,6 +280,7 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg) } export_event_state(msg, EVENT_QUEUED); + info("seq %llu queued, '%s' '%s'", msg->seqnum, msg->action, msg->subsystem); /* run one event after the other in debug mode */ if (debug_trace) { @@ -469,11 +470,16 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit) if (loop_msg->seqnum >= msg->seqnum) break; + /* check our old name */ + if (msg->devpath_old != NULL) + if (strcmp(loop_msg->devpath , msg->devpath_old) == 0) + return 2; + /* check identical, parent, or child device event */ if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) { dbg("%llu, device event still pending %llu (%s)", msg->seqnum, loop_msg->seqnum, loop_msg->devpath); - return 2; + return 3; } /* check physical device event (special case of parent) */ @@ -481,22 +487,27 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit) if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) { dbg("%llu, physical device event still pending %llu (%s)", msg->seqnum, loop_msg->seqnum, loop_msg->devpath); - return 3; + return 4; } } - /* check runing-queue for still running events */ + /* check run queue for still running events */ list_for_each_entry(loop_msg, &running_list, node) { if (limit && childs_count++ > limit) { dbg("%llu, maximum number (%i) of childs reached", msg->seqnum, childs_count); return 1; } + /* check our old name */ + if (msg->devpath_old != NULL) + if (strcmp(loop_msg->devpath , msg->devpath_old) == 0) + return 2; + /* check identical, parent, or child device event */ if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) { dbg("%llu, device event still running %llu (%s)", msg->seqnum, loop_msg->seqnum, loop_msg->devpath); - return 2; + return 3; } /* check physical device event (special case of parent) */ @@ -504,7 +515,7 @@ static int devpath_busy(struct udevd_uevent_msg *msg, int limit) if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) { dbg("%llu, physical device event still running %llu (%s)", msg->seqnum, loop_msg->seqnum, loop_msg->devpath); - return 3; + return 4; } } return 0; @@ -588,6 +599,8 @@ static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_siz msg->driver = &key[7]; else if (strncmp(key, "SEQNUM=", 7) == 0) msg->seqnum = strtoull(&key[7], NULL, 10); + else if (strncmp(key, "DEVPATH_OLD=", 12) == 0) + msg->devpath_old = &key[12]; else if (strncmp(key, "PHYSDEVPATH=", 12) == 0) msg->physdevpath = &key[12]; else if (strncmp(key, "PHYSDEVDRIVER=", 14) == 0) @@ -1202,7 +1215,7 @@ int main(int argc, char *argv[], char *envp[]) reload_config = 1; buf = malloc(nbytes); - if (buf != NULL) { + if (buf == NULL) { err("error getting buffer for inotify, disable watching"); close(inotify_fd); inotify_fd = -1;