summaryrefslogtreecommitdiff
path: root/udev.c
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2004-10-14 20:36:07 -0700
committerGreg KH <gregkh@suse.de>2005-04-26 22:02:44 -0700
commit707680b1cf08369da365de1a5e06089621ff8c77 (patch)
tree8ef5a035208acb8292102f4f61e078d0aac318cf /udev.c
parent32935a50ea9d0f97f9416da1512c11a346888d28 (diff)
[PATCH] remove sleeps from udev as it is external now
Here we remove all the sysfs sleep loops from udev as wait_for_sysfs will do this for us and any other hotplug user. We still keep a small blacklist of subsystems we don't care about but any missing entry here will no longer lead to a spinning udev waiting for files.
Diffstat (limited to 'udev.c')
-rw-r--r--udev.c52
1 files changed, 33 insertions, 19 deletions
diff --git a/udev.c b/udev.c
index a13f7013b6..d98a017396 100644
--- a/udev.c
+++ b/udev.c
@@ -75,14 +75,34 @@ static void asmlinkage sig_handler(int signum)
}
}
-static char *subsystem_blacklist[] = {
- "scsi_host",
- "scsi_device",
- "usb_host",
- "pci_bus",
- "pcmcia_socket",
- ""
-};
+/* list of subsystems we don't care about. not listing such systems here
+ * is not critical, but it makes it faster as we don't look for the "dev" file
+ */
+static int subsystem_without_dev(const char *subsystem)
+{
+ char *subsystem_blacklist[] = {
+ "scsi_host",
+ "scsi_device",
+ "usb_host",
+ "pci_bus",
+ "pcmcia_socket",
+ "bluetooth",
+ "i2c-adapter",
+ "pci_bus",
+ "ieee1394",
+ "ieee1394_host",
+ "ieee1394_node",
+ NULL
+ };
+ char **subsys;
+
+ for (subsys = subsystem_blacklist; *subsys != NULL; subsys++) {
+ if (strcmp(subsystem, *subsys) == 0)
+ return 1;
+ }
+
+ return 0;
+}
int main(int argc, char *argv[], char *envp[])
{
@@ -92,7 +112,6 @@ int main(int argc, char *argv[], char *envp[])
char *action;
char *devpath = "";
char *subsystem = "";
- int i;
int retval = -EINVAL;
enum {
ADD,
@@ -143,20 +162,16 @@ int main(int argc, char *argv[], char *envp[])
}
/* skip blacklisted subsystems */
- i = 0;
- while (subsystem_blacklist[i][0] != '\0') {
- if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
- dbg("don't care about '%s' devices", subsystem);
- goto exit;
- }
- i++;
- }
+ if (subsystem_without_dev(subsystem)) {
+ dbg("don't care about '%s' devices", subsystem);
+ exit(0);
+ };
}
/* set signal handlers */
act.sa_handler = (void (*) (int))sig_handler;
sigemptyset (&act.sa_mask);
- /* alarm must interrupt syscalls*/
+ /* alarm must not restart syscalls*/
sigaction(SIGALRM, &act, NULL);
sigaction(SIGINT, &act, NULL);
sigaction(SIGTERM, &act, NULL);
@@ -172,7 +187,6 @@ int main(int argc, char *argv[], char *envp[])
case UDEVSTART:
dbg("udevstart");
namedev_init();
- udev_sleep = 0;
retval = udev_start();
break;
case ADD: