[SCSI] libsas: Clean up rphys/port dev list after a discovery error on an expander (bf451207) · Commits · 戴 / test

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. This patch fixes up sas_expander.c separately because jejb has some cleanup patches of his own that are a prerequisite. Signed-off-by:

Darrick J. Wong <djwong@us.ibm.com> Signed-off-by:

James Bottomley <James.Bottomley@SteelEye.com>

drivers/scsi/libsas/sas_expander.c

+16 −4

Original line number	Diff line number	Diff line
		@@ -668,7 +668,6 @@ static struct domain_device *sas_ex_discover_end_dev(

		out_list_del:
		list_del(&child->dev_list_node);
		sas_rphy_free(rphy);
		out_free:
		sas_port_delete(phy->port);
		out_err:
		@@ -1431,14 +1430,27 @@ int sas_discover_root_expander(struct domain_device *dev)
		int res;
		struct sas_expander_device *ex = rphy_to_expander_device(dev->rphy);

		sas_rphy_add(dev->rphy);
		res = sas_rphy_add(dev->rphy);
		if (res)
		goto out_err;

		ex->level = dev->port->disc.max_level; /* 0 */
		res = sas_discover_expander(dev);
		if (!res)
		if (res)
		goto out_err2;

		sas_ex_bfs_disc(dev->port);

		return res;

		out_err2:
		sas_rphy_delete(dev->rphy);
		dev->rphy = NULL;
		return res;
		out_err:
		sas_rphy_free(dev->rphy);
		dev->rphy = NULL;
		return res;
		}

		/* ---------- Domain revalidation ---------- */

Admin message