X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevd.c;h=cfc091b699067e7d2e47214880b85ef9feb99d2f;hb=80be8c48c59708c52993ceddeedef8c2ed417016;hp=094175ac4a4a75354d537edc7b79d38c17b27637;hpb=4aca304e48d69766d47439f0d3dcaa8797b46c78;p=elogind.git

diff --git a/udev/udevd.c b/udev/udevd.c
index 094175ac4..cfc091b69 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -215,6 +215,17 @@ static void event_fork(struct udev_event *event)
 		/* set timeout to prevent hanging processes */
 		alarm(UDEV_EVENT_TIMEOUT);
 
+		/* clear any existing udev watch on the node */
+		if (inotify_fd != -1) {
+			struct udev_device *dev_old;
+
+			dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(event->dev));
+			if (dev_old != NULL) {
+				udev_watch_end(event->udev, dev_old);
+				udev_device_unref(dev_old);
+			}
+		}
+
 		/* apply rules, create node, symlinks */
 		err = udev_event_execute_rules(event, rules);
 
@@ -226,6 +237,11 @@ static void event_fork(struct udev_event *event)
 		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 &&
+		    strcmp(udev_device_get_action(event->dev), "remove") != 0)
+			udev_watch_begin(event->udev, event->dev);
+
 		info(event->udev, "seq %llu exit with %i\n", udev_device_get_seqnum(event->dev), err);
 		logging_close();
 		if (err != 0)
@@ -530,20 +546,25 @@ static int handle_inotify(struct udev *udev)
 
 	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 '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)
@@ -551,10 +572,11 @@ static int handle_inotify(struct udev *udev)
 				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);