X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin-path_id.c;h=223d9b138a07a375bd630d89dddf03fb5b9da0e3;hb=db5eea5a79b98a2b889f15dc21a5e0b57859b86b;hp=09abefc032783bc65941b636b715b521a2791919;hpb=33502ffe2eb7b56cdd018a4fb6830d7828519fad;p=elogind.git

diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index 09abefc03..223d9b138 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -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;
@@ -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");
@@ -451,6 +471,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];