| Message ID | 20170329094122.9997-1-jthumshirn@suse.de (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
On 03/29/2017 11:41 AM, Johannes Thumshirn wrote: > After commit bcdde7e ("sysfs: make __sysfs_remove_dir() recursive") changed the > removal path of kernfs to make it recursive we have to remove the SAS host > before the SCSI host or we will see sysfs warnings on not found sysfs groups for > kobjects. > > Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> > --- > drivers/scsi/aic94xx/aic94xx_init.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > Reviewed-by: Hannes Reinecke <hare@suse.com> Cheers, Hannes
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index 662b232..362d65a 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c @@ -701,13 +701,20 @@ static int asd_register_sas_ha(struct asd_ha_struct *asd_ha) static int asd_unregister_sas_ha(struct asd_ha_struct *asd_ha) { + struct Scsi_Host *shost = asd_ha->sas_ha.core.shost; + unsigned long flags; int err; - scsi_remove_host(asd_ha->sas_ha.core.shost); + spin_lock_irqsave(shost->host_lock, flags); + if (scsi_host_set_state(shost, SHOST_CANCEL)) + WARN_ON(scsi_host_set_state(shost, SHOST_CANCEL_RECOVERY)); + spin_unlock_irqrestore(shost->host_lock, flags); + err = sas_unregister_ha(&asd_ha->sas_ha); - sas_remove_host(asd_ha->sas_ha.core.shost); - scsi_host_put(asd_ha->sas_ha.core.shost); + sas_remove_host(shost); + scsi_remove_host(shost); + scsi_host_put(shost); kfree(asd_ha->sas_ha.sas_phy); kfree(asd_ha->sas_ha.sas_port);
After commit bcdde7e ("sysfs: make __sysfs_remove_dir() recursive") changed the removal path of kernfs to make it recursive we have to remove the SAS host before the SCSI host or we will see sysfs warnings on not found sysfs groups for kobjects. Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> --- drivers/scsi/aic94xx/aic94xx_init.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)