picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

udevd: inotify - modernizations

Browse source
This commit is contained in:
Kay Sievers 2014-06-04 11:05:45 +02:00
parent 6a010ac9e5
commit edd32000c8
1 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/udev/udevd.c
View file

@ -733,20 +733,30 @@ out:
return udev_ctrl_connection_unref(ctrl_conn); return udev_ctrl_connection_unref(ctrl_conn);
} }
static void synthesize_change(struct udev_device *dev) {
char filename[UTIL_PATH_SIZE];
log_debug("device %s closed, synthesising 'change'", udev_device_get_devnode(dev));
strscpyl(filename, sizeof(filename), udev_device_get_syspath(dev), "/uevent", NULL);
write_string_file(filename, "change");
}
/* read inotify messages */ /* read inotify messages */
static int handle_inotify(struct udev *udev) static int handle_inotify(struct udev *udev)
{ {
int nbytes, pos; int nbytes, pos;
char *buf; char *buf;
struct inotify_event *ev; struct inotify_event *ev;
int r;
if ((ioctl(fd_inotify, FIONREAD, &nbytes) < 0) || (nbytes <= 0)) r = ioctl(fd_inotify, FIONREAD, &nbytes);
return 0; if (r < 0 || nbytes <= 0)
return -errno;
buf = malloc(nbytes); buf = malloc(nbytes);
if (buf == NULL) { if (!buf) {
log_error("error getting buffer for inotify"); log_error("error getting buffer for inotify");
return -1; return -ENOMEM;
} }
nbytes = read(fd_inotify, buf, nbytes); nbytes = read(fd_inotify, buf, nbytes);
@ -756,27 +766,16 @@ static int handle_inotify(struct udev *udev)
ev = (struct inotify_event *)(buf + pos); ev = (struct inotify_event *)(buf + pos);
dev = udev_watch_lookup(udev, ev->wd); dev = udev_watch_lookup(udev, ev->wd);
if (dev != NULL) { if (!dev)
log_debug("inotify event: %x for %s", ev->mask, udev_device_get_devnode(dev)); continue;
if (ev->mask & IN_CLOSE_WRITE) {
char filename[UTIL_PATH_SIZE];
int fd;
log_debug("device %s closed, synthesising 'change'", udev_device_get_devnode(dev)); log_debug("inotify event: %x for %s", ev->mask, udev_device_get_devnode(dev));
strscpyl(filename, sizeof(filename), udev_device_get_syspath(dev), "/uevent", NULL); if (ev->mask & IN_CLOSE_WRITE)
fd = open(filename, O_WRONLY|O_CLOEXEC); synthesize_change(dev);
if (fd >= 0) { else if (ev->mask & IN_IGNORED)
if (write(fd, "change", 6) < 0) udev_watch_end(udev, dev);
log_debug("error writing uevent: %m");
close(fd);
}
}
if (ev->mask & IN_IGNORED)
udev_watch_end(udev, dev);
udev_device_unref(dev);
}
udev_device_unref(dev);
} }
free(buf); free(buf);