X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin-path_id.c;h=8eac991d3c2f6784c1e688e8d6c78cca34f2b22b;hp=a8559d2dd4118ac89feb03b7db8ef364caa73a0b;hb=2a3fe9a75951cb085b81569939f6af3ce2eb2b02;hpb=6df831f25ebc9f55cd939f04392dad9237706e45

diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index a8559d2dd..8eac991d3 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -176,7 +176,7 @@ static struct udev_device *handle_scsi_iscsi(struct udev_device *parent, char **
                 transportdev = udev_device_get_parent(transportdev);
                 if (transportdev == NULL)
                         return NULL;
-                if (strncmp(udev_device_get_sysname(transportdev), "session", 7) == 0)
+                if (startswith(udev_device_get_sysname(transportdev), "session"))
                         break;
         }
 
@@ -260,7 +260,7 @@ static struct udev_device *handle_scsi_default(struct udev_device *parent, char
                         continue;
                 if (dent->d_type != DT_DIR && dent->d_type != DT_LNK)
                         continue;
-                if (strncmp(dent->d_name, "host", 4) != 0)
+                if (!startswith(dent->d_name, "host"))
                         continue;
                 i = strtoul(&dent->d_name[4], &rest, 10);
                 if (rest[0] != '\0')
@@ -340,6 +340,20 @@ out:
         return parent;
 }
 
+static struct udev_device *handle_cciss(struct udev_device *parent, char **path)
+{
+        const char *str;
+        unsigned int controller, disk;
+
+        str = udev_device_get_sysname(parent);
+        if (sscanf(str, "c%ud%u%*s", &controller, &disk) != 2)
+                return NULL;
+
+        path_prepend(path, "cciss-disk%u", disk);
+        parent = skip_subsystem(parent, "cciss");
+        return parent;
+}
+
 static void handle_scsi_tape(struct udev_device *dev, char **path)
 {
         const char *name;
@@ -349,9 +363,9 @@ static void handle_scsi_tape(struct udev_device *dev, char **path)
                 return;
 
         name = udev_device_get_sysname(dev);
-        if (strncmp(name, "nst", 3) == 0 && strchr("lma", name[3]) != NULL)
+        if (startswith(name, "nst") && strchr("lma", name[3]) != NULL)
                 path_prepend(path, "nst%c", name[3]);
-        else if (strncmp(name, "st", 2) == 0 && strchr("lma", name[2]) != NULL)
+        else if (startswith(name, "st") && strchr("lma", name[2]) != NULL)
                 path_prepend(path, "st%c", name[2]);
 }
 
@@ -407,6 +421,7 @@ static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool
 {
         struct udev_device *parent;
         char *path = NULL;
+        bool some_transport = false;
 
         /* S390 ccw bus */
         parent = udev_device_get_parent_with_subsystem_devtype(dev, "ccw", NULL);
@@ -427,8 +442,13 @@ static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool
                         handle_scsi_tape(parent, &path);
                 } else if (strcmp(subsys, "scsi") == 0) {
                         parent = handle_scsi(parent, &path);
+                        some_transport = true;
+                } else if (strcmp(subsys, "cciss") == 0) {
+                        parent = handle_cciss(parent, &path);
+                        some_transport = true;
                 } else if (strcmp(subsys, "usb") == 0) {
                         parent = handle_usb(parent, &path);
+                        some_transport = true;
                 } else if (strcmp(subsys, "serio") == 0) {
                         path_prepend(&path, "serio-%s", udev_device_get_sysnum(parent));
                         parent = skip_subsystem(parent, "serio");
@@ -438,6 +458,7 @@ static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool
                 } else if (strcmp(subsys, "platform") == 0) {
                         path_prepend(&path, "platform-%s", udev_device_get_sysname(parent));
                         parent = skip_subsystem(parent, "platform");
+                        some_transport = true;
                 } else if (strcmp(subsys, "acpi") == 0) {
                         path_prepend(&path, "acpi-%s", udev_device_get_sysname(parent));
                         parent = skip_subsystem(parent, "acpi");
@@ -451,6 +472,17 @@ static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool
 
                 parent = udev_device_get_parent(parent);
         }
+
+        /*
+         * Do not return a single-parent-device-only for block
+         * devices, they might have entire buses behind it which
+         * do not get unique IDs only by using the parent device.
+         */
+        if (!some_transport && streq(udev_device_get_subsystem(dev), "block")) {
+                free(path);
+                path = NULL;
+        }
+
 out:
         if (path != NULL) {
                 char tag[UTIL_NAME_SIZE];