use the same email address everywhere

[elogind.git] / src / udev / udev-builtin-path_id.c

diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index 223d9b138a07a375bd630d89dddf03fb5b9da0e3..cbdeb38daa916992f89aa52a00f6e25bdea7f6bf 100644 (file)
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -1,7 +1,7 @@
 /*
  * compose persistent device path
  *
- * Copyright (C) 2009-2011 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2009-2011 Kay Sievers <kay@vrfy.org>
  *
  * Logic based on Hannes Reinecke's shell script.
  *
@@ -236,7 +236,23 @@ static struct udev_device *handle_scsi_default(struct udev_device *parent, char
         if (sscanf(name, "%d:%d:%d:%d", &host, &bus, &target, &lun) != 4)
                 return NULL;
 
-        /* rebase host offset to get the local relative number */
+        /*
+         * Rebase host offset to get the local relative number
+         *
+         * Note: This is by definition racy, unreliable and too simple.
+         * Please do not copy this model anywhere. It's just a left-over
+         * from the time we had no idea how things should look like in
+         * the end.
+         *
+         * Making assumptions about a global in-kernel counter and use
+         * that to calculate a local offset is a very broken concept. It
+         * can only work as long as things are in strict order.
+         *
+         * The kernel needs to export the instance/port number of a
+         * controller directly, without the need for rebase magic like
+         * this. Manual driver unbind/bind, parallel hotplug/unplug will
+         * get into the way of this "I hope it works" logic.
+         */
         basenum = -1;
         base = strdup(udev_device_get_syspath(hostdev));
         if (base == NULL)
@@ -458,6 +474,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");
@@ -467,6 +484,9 @@ static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool
                 } else if (strcmp(subsys, "virtio") == 0) {
                         path_prepend(&path, "virtio-pci-%s", udev_device_get_sysname(parent));
                         parent = skip_subsystem(parent, "virtio");
+                } else if (strcmp(subsys, "scm") == 0) {
+                        path_prepend(&path, "scm-%s", udev_device_get_sysname(parent));
+                        parent = skip_subsystem(parent, "scm");
                 }
 
                 parent = udev_device_get_parent(parent);