| Message ID | 20240307093733.41222-3-yangxingui@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | scsi: libsas: Fix disk not being scanned in after being removed | expand |
On 07/03/2024 09:37, Xingui Yang wrote: > Add a helper to get attached_sas_addr and device type from disc_resp. > > Suggested-by: John Garry <john.g.garry@oracle.com> > Signed-off-by: Xingui Yang <yangxingui@huawei.com> Reviewed-by: John Garry <john.g.garry@oracle.com> > --- > drivers/scsi/libsas/sas_expander.c | 19 ++++++++++++------- > 1 file changed, 12 insertions(+), 7 deletions(-) > > diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c > index 1eeb69cba8da..d6147616339f 100644 > --- a/drivers/scsi/libsas/sas_expander.c > +++ b/drivers/scsi/libsas/sas_expander.c > @@ -1631,6 +1631,16 @@ int sas_discover_root_expander(struct domain_device *dev) > > /* ---------- Domain revalidation ---------- */ > > +static void sas_get_sas_addr_and_dev_type(struct smp_disc_resp *disc_resp, > + u8 *sas_addr, > + enum sas_device_type *type) > +{ > + memcpy(sas_addr, disc_resp->disc.attached_sas_addr, SAS_ADDR_SIZE); > + *type = to_dev_type(&disc_resp->disc); > + if (*type == SAS_PHY_UNUSED) > + memset(sas_addr, 0, SAS_ADDR_SIZE); > +} > + > static int sas_get_phy_discover(struct domain_device *dev, > int phy_id, struct smp_disc_resp *disc_resp) > { > @@ -1684,13 +1694,8 @@ int sas_get_phy_attached_dev(struct domain_device *dev, int phy_id, > return -ENOMEM; > > res = sas_get_phy_discover(dev, phy_id, disc_resp); At some stage - I am not saying necessarily now! - it would be good to stop this function returning both a linux error code and a SAS protocol response code > - if (res == 0) { > - memcpy(sas_addr, disc_resp->disc.attached_sas_addr, > - SAS_ADDR_SIZE); > - *type = to_dev_type(&disc_resp->disc); > - if (*type == 0) > - memset(sas_addr, 0, SAS_ADDR_SIZE); > - } > + if (res == 0) > + sas_get_sas_addr_and_dev_type(disc_resp, sas_addr, type); > kfree(disc_resp); > return res; > }
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index 1eeb69cba8da..d6147616339f 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -1631,6 +1631,16 @@ int sas_discover_root_expander(struct domain_device *dev) /* ---------- Domain revalidation ---------- */ +static void sas_get_sas_addr_and_dev_type(struct smp_disc_resp *disc_resp, + u8 *sas_addr, + enum sas_device_type *type) +{ + memcpy(sas_addr, disc_resp->disc.attached_sas_addr, SAS_ADDR_SIZE); + *type = to_dev_type(&disc_resp->disc); + if (*type == SAS_PHY_UNUSED) + memset(sas_addr, 0, SAS_ADDR_SIZE); +} + static int sas_get_phy_discover(struct domain_device *dev, int phy_id, struct smp_disc_resp *disc_resp) { @@ -1684,13 +1694,8 @@ int sas_get_phy_attached_dev(struct domain_device *dev, int phy_id, return -ENOMEM; res = sas_get_phy_discover(dev, phy_id, disc_resp); - if (res == 0) { - memcpy(sas_addr, disc_resp->disc.attached_sas_addr, - SAS_ADDR_SIZE); - *type = to_dev_type(&disc_resp->disc); - if (*type == 0) - memset(sas_addr, 0, SAS_ADDR_SIZE); - } + if (res == 0) + sas_get_sas_addr_and_dev_type(disc_resp, sas_addr, type); kfree(disc_resp); return res; }
Add a helper to get attached_sas_addr and device type from disc_resp. Suggested-by: John Garry <john.g.garry@oracle.com> Signed-off-by: Xingui Yang <yangxingui@huawei.com> --- drivers/scsi/libsas/sas_expander.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)