if (err == 0 && !event->ignore_device && udev_get_run(event->udev))
udev_event_execute_run(event);
+ /* apply/restore inotify watch */
+ if (err == 0 && event->inotify_watch) {
+ udev_watch_begin(event->udev, event->dev);
+ udev_device_update_db(event->dev);
+ }
+
info(event->udev, "seq %llu exit with %i\n", udev_device_get_seqnum(event->dev), err);
logging_close();
if (err != 0)
int nbytes, pos;
char *buf;
struct inotify_event *ev;
- int reload_config = 0;
if ((ioctl(inotify_fd, FIONREAD, &nbytes) < 0) || (nbytes <= 0))
return 0;
read(inotify_fd, buf, nbytes);
- for (pos = 0, ev = (struct inotify_event *)(buf + pos); pos < nbytes; pos += sizeof(struct inotify_event) + ev->len) {
- const char *syspath;
+ for (pos = 0; pos < nbytes; pos += sizeof(struct inotify_event) + ev->len) {
+ struct udev_device *dev;
- dbg(udev, "inotify event: %x for %d (%s)\n", ev->mask, ev->wd, ev->len ? ev->name : "*");
+ ev = (struct inotify_event *)(buf + pos);
+ if (ev->len) {
+ dbg(udev, "inotify event: %x for %s\n", ev->mask, ev->name);
+ reload_config = 1;
+ continue;
+ }
- syspath = udev_watch_lookup(udev, ev->wd);
- if (syspath != NULL) {
- dbg(udev, "inotify event: %x for %s\n", ev->mask, syspath);
+ dev = udev_watch_lookup(udev, ev->wd);
+ if (dev != NULL) {
+ dbg(udev, "inotify event: %x for %s\n", ev->mask, udev_device_get_devnode(dev));
if (ev->mask & IN_CLOSE_WRITE) {
char filename[UTIL_PATH_SIZE];
int fd;
- info(udev, "device %s closed, synthesising write\n", syspath);
- util_strlcpy(filename, syspath, sizeof(filename));
+ info(udev, "device %s closed, synthesising 'change'\n", udev_device_get_devnode(dev));
+ util_strlcpy(filename, udev_device_get_syspath(dev), sizeof(filename));
util_strlcat(filename, "/uevent", sizeof(filename));
fd = open(filename, O_WRONLY);
if (fd < 0 || write(fd, "change", 6) < 0)
close(fd);
}
if (ev->mask & IN_IGNORED)
- udev_watch_end(udev, ev->wd);
- } else {
- reload_config = 1;
+ udev_watch_end(udev, dev);
+
+ udev_device_unref(dev);
}
+
}
free (buf);
- return reload_config;
+ return 0;
}
static void asmlinkage sig_handler(int signum)
/* rules directory inotify watch */
if (inotify_poll && (inotify_poll->revents & POLLIN))
- reload_config = handle_inotify(udev);
+ handle_inotify(udev);
handle_signals:
signal_received = 0;