Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1611760

[PATCH 6/6] scsi: pm8001: remove the SAS host after the SCSI host

Show all headers | View raw

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/pm8001/pm8001_init.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index 417368c..9116e9c 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -1086,11 +1086,21 @@ static void pm8001_pci_remove(struct pci_dev *pdev)
 {
 	struct sas_ha_struct *sha = pci_get_drvdata(pdev);
 	struct pm8001_hba_info *pm8001_ha;
+	unsigned long flags;
+	struct Scsi_Host *shost;
 	int i, j;
 	pm8001_ha = sha->lldd_ha;
-	scsi_remove_host(pm8001_ha->shost);
+	shost = pm8001_ha->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);
+
 	sas_unregister_ha(sha);
-	sas_remove_host(pm8001_ha->shost);
+	sas_remove_host(shost);
+	scsi_remove_host(shost);
+
 	list_del(&pm8001_ha->list);
 	PM8001_CHIP_DISP->interrupt_disable(pm8001_ha, 0xFF);
 	PM8001_CHIP_DISP->chip_soft_rst(pm8001_ha);
-- 
1.8.5.6

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/2] Fix sysfs recursive removal splats in isci Johannes Thumshirn <jthumshirn@suse.de> - 2017-03-29 11:50 +0200
  [PATCH 3/6] aic94xx: remove the SAS host after the SCSI host Johannes Thumshirn <jthumshirn@suse.de> - 2017-03-29 11:50 +0200
    Re: [PATCH 3/6] aic94xx: remove the SAS host after the SCSI host Hannes Reinecke <hare@suse.de> - 2017-03-29 12:20 +0200
  [PATCH 5/6] mvsas: remove the SAS host after the SCSI host Johannes Thumshirn <jthumshirn@suse.de> - 2017-03-29 11:50 +0200
    Re: [PATCH 5/6] mvsas: remove the SAS host after the SCSI host Hannes Reinecke <hare@suse.de> - 2017-03-29 12:20 +0200
  [PATCH 2/2] scsi: isci: remove the SAS host after the SCSI host Johannes Thumshirn <jthumshirn@suse.de> - 2017-03-29 11:50 +0200
    Re: [PATCH 2/2] scsi: isci: remove the SAS host after the SCSI host Hannes Reinecke <hare@suse.de> - 2017-03-29 12:20 +0200
  [PATCH 6/6] scsi: pm8001: remove the SAS host after the SCSI host Johannes Thumshirn <jthumshirn@suse.de> - 2017-03-29 11:50 +0200
    Re: [PATCH 6/6] scsi: pm8001: remove the SAS host after the SCSI host Hannes Reinecke <hare@suse.de> - 2017-03-29 12:20 +0200
    Re: [PATCH 6/6] scsi: pm8001: remove the SAS host after the SCSI host Jinpu Wang <jinpu.wang@profitbricks.com> - 2017-03-29 12:30 +0200
      Re: [PATCH 6/6] scsi: pm8001: remove the SAS host after the SCSI host Hannes Reinecke <hare@suse.de> - 2017-03-29 12:40 +0200
  Re: [PATCH 0/2] Fix sysfs recursive removal splats in isci James Bottomley <jejb@linux.vnet.ibm.com> - 2017-03-29 13:40 +0200
  Re: [PATCH 0/2] Fix sysfs recursive removal splats in isci Tejun Heo <tj@kernel.org> - 2017-03-29 17:30 +0200

csiph-web