@@ -3151,3 +3151,12 @@ int scsi_vpd_tpg_id(struct scsi_device *sdev, int *rel_id)
return group_id;
}
EXPORT_SYMBOL(scsi_vpd_tpg_id);
+
+int scsi_durable_name(struct scsi_device *sdev, char *buf, size_t len)
+{
+ int vpd_len = scsi_vpd_lun_id(sdev, buf, len);
+ if (vpd_len > 0 && vpd_len < len)
+ return vpd_len + 1;
+ return 0;
+}
+EXPORT_SYMBOL(scsi_durable_name);
@@ -504,15 +504,19 @@ static struct class sdev_class = {
.dev_release = scsi_device_cls_release,
};
+static struct scsi_device *dev_to_scsi_device(const struct device *dev)
+{
+ return dev->type == &scsi_dev_type ? to_scsi_device(dev) : NULL;
+}
+
/* all probing is done in the individual ->probe routines */
static int scsi_bus_match(struct device *dev, struct device_driver *gendrv)
{
- struct scsi_device *sdp;
+ struct scsi_device *sdp = dev_to_scsi_device(dev);
- if (dev->type != &scsi_dev_type)
+ if (!sdp)
return 0;
- sdp = to_scsi_device(dev);
if (sdp->no_uld_attach)
return 0;
return (sdp->inq_periph_qual == SCSI_INQ_PQ_CON)? 1: 0;
@@ -520,13 +524,11 @@ static int scsi_bus_match(struct device *dev, struct device_driver *gendrv)
static int scsi_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
{
- struct scsi_device *sdev;
+ struct scsi_device *sdev = dev_to_scsi_device(dev);
- if (dev->type != &scsi_dev_type)
+ if (!sdev)
return 0;
- sdev = to_scsi_device(dev);
-
add_uevent_var(env, "MODALIAS=" SCSI_DEVICE_MODALIAS_FMT, sdev->type);
return 0;
}
@@ -1582,6 +1584,24 @@ static struct device_type scsi_dev_type = {
.groups = scsi_sdev_attr_groups,
};
+int dev_to_scsi_durable_name(const struct device *dev, char *buf, size_t len)
+{
+ /*
+ * When we go through dev_printk in the scsi layer, dev is embedded
+ * in a struct scsi_device. When we go through the block layer,
+ * dev is embedded in struct genhd, thus we need different paths to
+ * retrieve the struct scsi_device to call scsi_durable_name.
+ */
+ struct scsi_device *sdev = dev_to_scsi_device(dev);
+ if (!sdev)
+ sdev = dev_to_scsi_device(dev->parent);
+ if (!sdev)
+ return 0;
+
+ return scsi_durable_name(sdev, buf, len);
+}
+EXPORT_SYMBOL(dev_to_scsi_durable_name);
+
void scsi_sysfs_device_initialize(struct scsi_device *sdev)
{
unsigned long flags;
@@ -1591,6 +1611,7 @@ void scsi_sysfs_device_initialize(struct scsi_device *sdev)
device_initialize(&sdev->sdev_gendev);
sdev->sdev_gendev.bus = &scsi_bus_type;
sdev->sdev_gendev.type = &scsi_dev_type;
+ sdev->sdev_gendev.durable_name = dev_to_scsi_durable_name;
dev_set_name(&sdev->sdev_gendev, "%d:%d:%d:%llu",
sdev->host->host_no, sdev->channel, sdev->id, sdev->lun);
@@ -3386,6 +3386,8 @@ static int sd_probe(struct device *dev)
gd->private_data = &sdkp->driver;
gd->queue = sdkp->device->request_queue;
+ disk_to_dev(gd)->durable_name = dev_to_scsi_durable_name;
+
/* defaults, until the device tells us otherwise */
sdp->sector_size = 512;
sdkp->capacity = 0;
@@ -464,6 +464,9 @@ extern void sdev_disable_disk_events(struct scsi_device *sdev);
extern void sdev_enable_disk_events(struct scsi_device *sdev);
extern int scsi_vpd_lun_id(struct scsi_device *, char *, size_t);
extern int scsi_vpd_tpg_id(struct scsi_device *, int *);
+extern int dev_to_scsi_durable_name(const struct device *dev, char *buf,
+ size_t len);
+extern int scsi_durable_name(struct scsi_device *sdev, char *buf, size_t len);
#ifdef CONFIG_PM
extern int scsi_autopm_get_device(struct scsi_device *);
Add the needed functions to fill out the durable_name function call back for scsi based storage devices. This allows calls into dev_printk for scsi devices to have a persistent id associated with them. Signed-off-by: Tony Asleson <tasleson@redhat.com> --- drivers/scsi/scsi_lib.c | 9 +++++++++ drivers/scsi/scsi_sysfs.c | 35 ++++++++++++++++++++++++++++------- drivers/scsi/sd.c | 2 ++ include/scsi/scsi_device.h | 3 +++ 4 files changed, 42 insertions(+), 7 deletions(-)