mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-28 15:20:41 +00:00
Code Issues Releases Wiki Activity

[SCSI] libsas: Clean up rphys/port dev list after a discovery error.

Browse source 
sas_get_port_device assigns a rphy to a domain device in anticipation
of finding a disk.  When a discovery error occurs in
sas_discover_{sata,sas,expander}*, however, we need to clean up that
rphy and the port device list so that we don't GPF.  In addition, we
need to check the result of the second sas_notify_lldd_dev_found.
This patch seems ok on a x260, x366 and x206m.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Darrick J. Wong 2007-01-11 14:14:49 -08:00 committed by James Bottomley
parent befede3dab
commit 8880839815
1 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
drivers/scsi/libsas/sas_discover.c
View file

@ -548,7 +548,7 @@ int sas_discover_sata(struct domain_device *dev)
res = sas_notify_lldd_dev_found(dev);
if (res)
return res;
goto out_err2;
switch (dev->dev_type) {
case SATA_DEV:
@ -560,11 +560,25 @@ int sas_discover_sata(struct domain_device *dev)
default:
break;
}
if (res)
goto out_err;
sas_notify_lldd_dev_gone(dev);
if (!res) {
sas_notify_lldd_dev_found(dev);
}
res = sas_notify_lldd_dev_found(dev);
if (res)
goto out_err2;
res = sas_rphy_add(dev->rphy);
if (res)
goto out_err;
return res;
out_err:
sas_notify_lldd_dev_gone(dev);
out_err2:
sas_rphy_free(dev->rphy);
dev->rphy = NULL;
return res;
}
@ -580,7 +594,7 @@ int sas_discover_end_dev(struct domain_device *dev)
res = sas_notify_lldd_dev_found(dev);
if (res)
return res;
goto out_err2;
res = sas_rphy_add(dev->rphy);
if (res)
@ -589,12 +603,21 @@ int sas_discover_end_dev(struct domain_device *dev)
/* do this to get the end device port attributes which will have
* been scanned in sas_rphy_add */
sas_notify_lldd_dev_gone(dev);
sas_notify_lldd_dev_found(dev);
res = sas_notify_lldd_dev_found(dev);
if (res)
goto out_err3;
return 0;
out_err:
sas_notify_lldd_dev_gone(dev);
out_err2:
sas_rphy_free(dev->rphy);
dev->rphy = NULL;
return res;
out_err3:
sas_rphy_delete(dev->rphy);
dev->rphy = NULL;
return res;
}
@ -686,6 +709,10 @@ static void sas_discover_domain(struct work_struct *work)
}
if (error) {
spin_lock(&port->dev_list_lock);
list_del_init(&port->port_dev->dev_list_node);
spin_unlock(&port->dev_list_lock);
kfree(port->port_dev); /* not kobject_register-ed yet */
port->port_dev = NULL;
}