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

Groups > linux.kernel > #1611754

[PATCH 5/6] mvsas: 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/mvsas/mv_init.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index 8280046..32b86c8 100644
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -634,17 +634,26 @@ static void mvs_pci_remove(struct pci_dev *pdev)
 	unsigned short core_nr, i = 0;
 	struct sas_ha_struct *sha = pci_get_drvdata(pdev);
 	struct mvs_info *mvi = NULL;
+	struct Scsi_Host *shost;
+	unsigned long flags;
 
 	core_nr = ((struct mvs_prv_info *)sha->lldd_ha)->n_host;
 	mvi = ((struct mvs_prv_info *)sha->lldd_ha)->mvi[0];
+	shost = mvi->shost;
 
 #ifdef CONFIG_SCSI_MVSAS_TASKLET
 	tasklet_kill(&((struct mvs_prv_info *)sha->lldd_ha)->mv_tasklet);
 #endif
 
-	scsi_remove_host(mvi->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(mvi->shost);
+	sas_remove_host(shost);
+	scsi_remove_host(shost);
 
 	MVS_CHIP_DISP->interrupt_disable(mvi);
 	free_irq(mvi->pdev->irq, sha);
-- 
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