X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevd.c;h=27e64dae3acbb9a8a6d6f3388ac2842686b4e01e;hp=50205f1e43c3e4ddee4f3049bab5c9ede42510a1;hb=03e0170db3ef69c70db7cd74e6689c7b78c91c3d;hpb=521b3a9211b4e2d98bf7ae61c3844a42dde773e2

diff --git a/udev/udevd.c b/udev/udevd.c
index 50205f1e4..27e64dae3 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -216,9 +216,7 @@ static void event_fork(struct udev_event *event)
 		alarm(UDEV_EVENT_TIMEOUT);
 
 		/* clear any existing udev watch on the node */
-		if (inotify_fd != -1 &&
-		    major(udev_device_get_devnum(event->dev)) != 0)
-			udev_watch_clear(event->udev, event->dev);
+		udev_watch_clear(event->udev, event->dev);
 
 		/* apply rules, create node, symlinks */
 		err = udev_event_execute_rules(event, rules);
@@ -232,8 +230,7 @@ static void event_fork(struct udev_event *event)
 			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 &&
+		if (err == 0 && event->inotify_watch &&
 		    strcmp(udev_device_get_action(event->dev), "remove") != 0)
 			info(event->udev, "device will be watched for changes\n");
 			udev_watch_begin(event->udev, event->dev);