summaryrefslogtreecommitdiff
path: root/udev/udevd.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-02-11 21:56:35 +0100
committerKay Sievers <kay.sievers@vrfy.org>2009-02-11 21:56:35 +0100
commit4aca304e48d69766d47439f0d3dcaa8797b46c78 (patch)
treea8099f1f873f06d1c544b50b3e6a196a0e43b20b /udev/udevd.c
parent88ec7bb7543ff9fd15fdce03a1889e7e388a0051 (diff)
use global "reload_config" flag
Diffstat (limited to 'udev/udevd.c')
-rw-r--r--udev/udevd.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/udev/udevd.c b/udev/udevd.c
index d93781f411..094175ac4a 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -516,7 +516,6 @@ static int handle_inotify(struct udev *udev)
int nbytes, pos;
char *buf;
struct inotify_event *ev;
- int reload_config = 0;
if ((ioctl(inotify_fd, FIONREAD, &nbytes) < 0) || (nbytes <= 0))
return 0;
@@ -543,7 +542,7 @@ static int handle_inotify(struct udev *udev)
char filename[UTIL_PATH_SIZE];
int fd;
- info(udev, "device %s closed, synthesising write\n", syspath);
+ info(udev, "device %s closed, synthesising 'change'\n", syspath);
util_strlcpy(filename, syspath, sizeof(filename));
util_strlcat(filename, "/uevent", sizeof(filename));
fd = open(filename, O_WRONLY);
@@ -559,7 +558,7 @@ static int handle_inotify(struct udev *udev)
}
free (buf);
- return reload_config;
+ return 0;
}
static void asmlinkage sig_handler(int signum)
@@ -985,7 +984,7 @@ int main(int argc, char *argv[])
/* rules directory inotify watch */
if (inotify_poll && (inotify_poll->revents & POLLIN))
- reload_config = handle_inotify(udev);
+ handle_inotify(udev);
handle_signals:
signal_received = 0;