chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add m4/ subdir
[elogind.git]
/
udev
/
udevd.c
diff --git
a/udev/udevd.c
b/udev/udevd.c
index e4fa2b63e10a58044d6cf356139bef8095aaadf0..ee3d6f50338600db3608ce4d49a8408bc62b3c19 100644
(file)
--- a/
udev/udevd.c
+++ b/
udev/udevd.c
@@
-227,13
+227,9
@@
static void event_fork(struct udev_event *event)
udev_event_execute_run(event);
/* apply/restore inotify watch */
udev_event_execute_run(event);
/* apply/restore inotify watch */
- if (err == 0 && event->inotify_watch && inotify_fd != -1 &&
- major(udev_device_get_devnum(event->dev)) != 0 &&
- strcmp(udev_device_get_action(event->dev), "remove") != 0) {
- info(event->udev, "device will be watched for changes\n");
+ if (err == 0 && event->inotify_watch) {
udev_watch_begin(event->udev, event->dev);
udev_watch_begin(event->udev, event->dev);
- } else {
- udev_watch_clear(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);
}
info(event->udev, "seq %llu exit with %i\n", udev_device_get_seqnum(event->dev), err);
@@
-540,20
+536,25
@@
static int handle_inotify(struct udev *udev)
read(inotify_fd, buf, nbytes);
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;
if (ev->mask & IN_CLOSE_WRITE) {
char filename[UTIL_PATH_SIZE];
int fd;
- info(udev, "device %s closed, synthesising 'change'\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)
util_strlcat(filename, "/uevent", sizeof(filename));
fd = open(filename, O_WRONLY);
if (fd < 0 || write(fd, "change", 6) < 0)
@@
-561,10
+562,11
@@
static int handle_inotify(struct udev *udev)
close(fd);
}
if (ev->mask & IN_IGNORED)
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);
}
free (buf);