@@ -55,7 +55,7 @@ static DEFINE_IDA(host_index_ida);
static void scsi_host_cls_release(struct device *dev)
{
- put_device(&class_to_shost(dev)->shost_gendev);
+ put_device(dev->parent);
}
static struct class shost_class = {
@@ -261,8 +261,6 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev,
if (error)
goto out_del_gendev;
- get_device(&shost->shost_gendev);
-
if (shost->transportt->host_size) {
shost->shost_data = kzalloc(shost->transportt->host_size,
GFP_KERNEL);
@@ -473,7 +471,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
shost->shost_gendev.type = &scsi_host_type;
device_initialize(&shost->shost_dev);
- shost->shost_dev.parent = &shost->shost_gendev;
+ shost->shost_dev.parent = get_device(&shost->shost_gendev);
shost->shost_dev.class = &shost_class;
dev_set_name(&shost->shost_dev, "host%d", shost->host_no);
shost->shost_dev.groups = scsi_sysfs_shost_attr_groups;
@@ -503,7 +501,9 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
fail_index_remove:
ida_simple_remove(&host_index_ida, shost->host_no);
fail_kfree:
- kfree(shost);
+ put_device(&shost->shost_dev);
+ put_device(&shost->shost_gendev);
+
return NULL;
}
EXPORT_SYMBOL(scsi_host_alloc);
After device is initialized via device_initialize(), or its name is set via dev_set_name(), the device has to be freed via put_device(), otherwise device name will be leaked because it is allocated dynamically in dev_set_name(). Fixes the issue by replacing kfree(shost) via two put_device() since both .shost_dev and .shost_gendev share same lifetime. Meantime move get_device(shost->shost_gendev) from scsi_add_host_with_dma to scsi_host_alloc(), so that we can grab parent's refcnt explicitly when assigning .shost_dev->parent. With this way code becomes more readable. Also call put_device(dev->parent) in scsi_host_cls_release() so that code readability can be improved. Cc: Bart Van Assche <bvanassche@acm.org> Cc: John Garry <john.garry@huawei.com> Cc: Hannes Reinecke <hare@suse.de> Signed-off-by: Ming Lei <ming.lei@redhat.com> --- drivers/scsi/hosts.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)