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;
}
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')
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]);
}
{
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);
handle_scsi_tape(parent, &path);
} else if (strcmp(subsys, "scsi") == 0) {
parent = handle_scsi(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");
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];