X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevd.c;h=ee3d6f50338600db3608ce4d49a8408bc62b3c19;hb=3d3a0a709a38805259fe07240c3ca47a120dd5d6;hp=5598628a5150ae657970185c891a9bf1316beff3;hpb=b8e96d67a2c842dc750b5193cb732a077a3149ed;p=elogind.git

diff --git a/udev/udevd.c b/udev/udevd.c
index 5598628a5..ee3d6f503 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -215,17 +215,6 @@ 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);
 
@@ -238,9 +227,10 @@ static void event_fork(struct udev_event *event)
 			udev_event_execute_run(event);
 
 		/* apply/restore inotify watch */
-		if (err == 0 && event->inotify_watch &&
-		    strcmp(udev_device_get_action(event->dev), "remove") != 0)
+		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();
@@ -546,9 +536,10 @@ 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) {
+	for (pos = 0; pos < nbytes; pos += sizeof(struct inotify_event) + ev->len) {
 		struct udev_device *dev;
 
+		ev = (struct inotify_event *)(buf + pos);
 		if (ev->len) {
 			dbg(udev, "inotify event: %x for %s\n", ev->mask, ev->name);
 			reload_config = 1;