[PATCH] udev kill extra bus_id compares in match_id

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 6685596479ac14102246ab40c555b51886ceb303..59ec08c715e58bdc92a52f669ecc86b8845e6e1e 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -313,6 +313,19 @@ exit:
        return; /* here to prevent compiler warning... */
 }
 
+static void fix_kernel_name(struct udevice *udev)
+{
+       char *temp = udev->kernel_name;
+
+       while (*temp != 0x00) {
+               /* Some block devices have a ! in their name, 
+                * we need to change that to / */
+               if (*temp == '!')
+                       *temp = '/';
+               ++temp;
+       }
+}
+
 static int execute_program(char *path, char *value, int len)
 {
        int retval;
@@ -456,32 +469,19 @@ static int match_sysfs_pairs(struct config_device *dev, struct sysfs_class_devic
 static int match_id(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
        char path[SYSFS_PATH_MAX];
-       int found;
        char *temp = NULL;
 
        /* we have to have a sysfs device for ID to work */
        if (!sysfs_device)
                return -ENODEV;
 
-       found = 0;
        strfieldcpy(path, sysfs_device->path);
        temp = strrchr(path, '/');
        dbg("search '%s' in '%s', path='%s'", dev->id, temp, path);
-       if (strstr(temp, dev->id) != NULL) {
-               found = 1;
-       } else {
-               *temp = 0x00;
-               temp = strrchr(path, '/');
-               dbg("search '%s' in '%s', path='%s'", dev->id, temp, path);
-               if (strstr(temp, dev->id) != NULL)
-                       found = 1;
-       }
-       if (!found) {
-               dbg("id doesn't match");
+       if (strstr(temp, dev->id) == NULL)
                return -ENODEV;
-       }
-
-       return 0;
+       else
+               return 0;
 }
 
 static int match_place(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
@@ -589,12 +589,12 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
                if (dev->bus[0] != '\0') {
                        if (sysfs_device == NULL) {
                                dbg("device has no bus");
-                               goto no_good;
+                               goto try_parent;
                        }
                        dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
                        if (strcmp_pattern(dev->bus, sysfs_device->bus) != 0) {
                                dbg(FIELD_BUS " is not matching");
-                               goto no_good;
+                               goto try_parent;
                        } else {
                                dbg(FIELD_BUS " matches");
                        }
@@ -605,7 +605,7 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
                        dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'", dev->kernel, class_dev->name);
                        if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
                                dbg(FIELD_KERNEL " is not matching");
-                               goto no_good;
+                               goto try_parent;
                        } else {
                                dbg(FIELD_KERNEL " matches");
                        }
@@ -616,7 +616,7 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
                        dbg("check " FIELD_ID);
                        if (match_id(dev, class_dev, sysfs_device) != 0) {
                                dbg(FIELD_ID " is not matching");
-                               goto no_good;
+                               goto try_parent;
                        } else {
                                dbg(FIELD_ID " matches");
                        }
@@ -627,7 +627,7 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
                        dbg("check " FIELD_PLACE);
                        if (match_place(dev, class_dev, sysfs_device) != 0) {
                                dbg(FIELD_PLACE " is not matching");
-                               goto no_good;
+                               goto try_parent;
                        } else {
                                dbg(FIELD_PLACE " matches");
                        }
@@ -638,7 +638,7 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
                        dbg("check " FIELD_SYSFS " pairs");
                        if (match_sysfs_pairs(dev, class_dev, sysfs_device) != 0) {
                                dbg(FIELD_SYSFS " is not matching");
-                               goto no_good;
+                               goto try_parent;
                        } else {
                                dbg(FIELD_SYSFS " matches");
                        }
@@ -650,7 +650,7 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
                        apply_format(udev, dev->program);
                        if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) {
                                dbg(FIELD_PROGRAM " returned nozero");
-                               goto no_good;
+                               goto try_parent;
                        } else {
                                dbg(FIELD_PROGRAM " returned successful");
                        }
@@ -663,22 +663,17 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
                            dev->result, udev->program_result);
                        if (strcmp_pattern(dev->result, udev->program_result) != 0) {
                                dbg(FIELD_RESULT " is not matching");
-                               goto no_good;
+                               goto try_parent;
                        } else {
                                dbg(FIELD_RESULT " matches");
                        }
                }
 
-               /* check if we are instructed to ignore this device */
-               if (dev->name[0] == '\0') {
-                       dbg("instructed to ignore this device");
-                       return -1;
-               }
-
                /* Yeah, we matched! */
                return 0;
 
-no_good:
+try_parent:
+               dbg("try parent sysfs device");
                sysfs_device = sysfs_get_device_parent(sysfs_device);
                if (sysfs_device == NULL)
                        return -ENODEV;
@@ -706,11 +701,12 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
                dbg("sysfs_device->bus='%s'", sysfs_device->bus);
                strfieldcpy(udev->bus_id, sysfs_device->bus_id);
                wait_for_device_to_initialize(sysfs_device);
-       } else {
-               dbg("class_dev->name = '%s'", class_dev->name);
        }
+       dbg("class_dev->name = '%s'", class_dev->name);
 
        strfieldcpy(udev->kernel_name, class_dev->name);
+       fix_kernel_name(udev);
+       dbg("udev->kernel_name = '%s'", udev->kernel_name);
 
        /* get kernel number */
        pos = class_dev->name + strlen(class_dev->name);
@@ -722,11 +718,15 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
        /* look for a matching rule to apply */
        list_for_each_entry(dev, &config_device_list, node) {
                dbg("process rule");
-
                if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
-                       /* Yup, this rule belongs to us! */
+                       if (dev->name[0] == '\0') {
+                               info("configured rule in '%s' at line %i applied, '%s' is ignored",
+                                    udev_rules_filename, dev->config_line, udev->kernel_name);
+                               return -1;
+                       }
+
                        info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
-                           udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
+                            udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
                        strfieldcpy(udev->name, dev->name);
                        strfieldcpy(udev->symlink, dev->symlink);
                        goto found;