dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-26 03:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup a little.

Browse Source 
Move some of the checks into udev_watch_begin() and udev_watch_clear()
so we don't have to repeat them all the time.
This commit is contained in:
Scott James Remnant
2009-02-23 17:21:24 +00:00
parent 521b3a9211
commit 03e0170db3
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
udev/udev-watch.c
View File

@@ -142,7 +142,7 @@ void udev_watch_begin(struct udev *udev, struct udev_device *dev)
const char *filename;
int wd;
if (inotify_fd < 0)
if (inotify_fd < 0 || major(udev_device_get_devnum(dev)) == 0)
return;
wd = inotify_add_watch(inotify_fd, udev_device_get_devnode(dev), IN_CLOSE_WRITE);
@@ -163,6 +163,9 @@ void udev_watch_clear(struct udev *udev, struct udev_device *dev)
DIR *dir;
struct dirent *ent;
if (inotify_fd < 0 || major(udev_device_get_devnum(dev)) == 0)
return;
util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
util_strlcat(filename, "/.udev/watch", sizeof(filename));

7
udev/udevd.c
View File

@@ -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);