leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SCSI] sas transport: ref count update

Browse Source 
Fix puts so that release functions will be called.

Signed-off-by: Mike Anderson <andmike@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Mike Anderson 2006-03-27 09:37:28 -08:00 committed by James Bottomley
parent 9a72f976d2
commit 92aab6464b
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/scsi/scsi_transport_sas.c
View File

@ -406,8 +406,6 @@ struct sas_phy *sas_phy_alloc(struct device *parent, int number)
if (!phy) if (!phy)
return NULL; return NULL;
get_device(parent);
phy->number = number; phy->number = number;
device_initialize(&phy->dev); device_initialize(&phy->dev);
@ -459,10 +457,7 @@ EXPORT_SYMBOL(sas_phy_add);
void sas_phy_free(struct sas_phy *phy) void sas_phy_free(struct sas_phy *phy)
{ {
transport_destroy_device(&phy->dev); transport_destroy_device(&phy->dev);
put_device(phy->dev.parent); put_device(&phy->dev);
put_device(phy->dev.parent);
put_device(phy->dev.parent);
kfree(phy);
} }
EXPORT_SYMBOL(sas_phy_free); EXPORT_SYMBOL(sas_phy_free);
@ -484,7 +479,7 @@ sas_phy_delete(struct sas_phy *phy)
transport_remove_device(dev); transport_remove_device(dev);
device_del(dev); device_del(dev);
transport_destroy_device(dev); transport_destroy_device(dev);
put_device(dev->parent); put_device(dev);
} }
EXPORT_SYMBOL(sas_phy_delete); EXPORT_SYMBOL(sas_phy_delete);
@ -800,7 +795,6 @@ struct sas_rphy *sas_end_device_alloc(struct sas_phy *parent)
rdev = kzalloc(sizeof(*rdev), GFP_KERNEL); rdev = kzalloc(sizeof(*rdev), GFP_KERNEL);
if (!rdev) { if (!rdev) {
put_device(&parent->dev);
return NULL; return NULL;
} }
@ -836,7 +830,6 @@ struct sas_rphy *sas_expander_alloc(struct sas_phy *parent,
rdev = kzalloc(sizeof(*rdev), GFP_KERNEL); rdev = kzalloc(sizeof(*rdev), GFP_KERNEL);
if (!rdev) { if (!rdev) {
put_device(&parent->dev);
return NULL; return NULL;
} }
@ -910,6 +903,7 @@ EXPORT_SYMBOL(sas_rphy_add);
*/ */
void sas_rphy_free(struct sas_rphy *rphy) void sas_rphy_free(struct sas_rphy *rphy)
{ {
struct device *dev = &rphy->dev;
struct Scsi_Host *shost = dev_to_shost(rphy->dev.parent->parent); struct Scsi_Host *shost = dev_to_shost(rphy->dev.parent->parent);
struct sas_host_attrs *sas_host = to_sas_host_attrs(shost); struct sas_host_attrs *sas_host = to_sas_host_attrs(shost);
@ -917,21 +911,9 @@ void sas_rphy_free(struct sas_rphy *rphy)
list_del(&rphy->list); list_del(&rphy->list);
mutex_unlock(&sas_host->lock); mutex_unlock(&sas_host->lock);
transport_destroy_device(&rphy->dev); transport_destroy_device(dev);
put_device(rphy->dev.parent);
put_device(rphy->dev.parent);
put_device(rphy->dev.parent);
if (rphy->identify.device_type == SAS_END_DEVICE) {
struct sas_end_device *edev = rphy_to_end_device(rphy);
kfree(edev); put_device(dev);
} else {
/* must be expander */
struct sas_expander_device *edev =
rphy_to_expander_device(rphy);
kfree(edev);
}
} }
EXPORT_SYMBOL(sas_rphy_free); EXPORT_SYMBOL(sas_rphy_free);
@ -971,7 +953,7 @@ sas_rphy_delete(struct sas_rphy *rphy)
parent->rphy = NULL; parent->rphy = NULL;
put_device(&parent->dev); put_device(dev);
} }
EXPORT_SYMBOL(sas_rphy_delete); EXPORT_SYMBOL(sas_rphy_delete);