mvsas: remove SCSI host before detaching from SAS transport
authorJack Wang <jinpu.wang@profitbricks.com>
Thu, 5 Nov 2015 11:34:18 +0000 (12:34 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 10 Nov 2015 00:37:38 +0000 (19:37 -0500)
commit cff549e4860f ("scsi: proper state checking and module refcount
handling in scsi_device_get") the reference count of scsi device was
changed, which could lead to when rmmod with at least on drive attached,
SCSI error handle will run into infinite loop, and lockup the system.

Fix it by remove scsi host first, this way scsi core will not send
commands down after detaching SAS transport.

This is a follow up fix for Benjamin's fix for pm80xx.

See also:
http://www.spinics.net/lists/linux-scsi/msg90088.html

Signed-off-by: Jack Wang <jinpu.wang@profitbricks.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/mvsas/mv_init.c

index e2d555c1bffc16f94a87ed6b009d868cc3784a3e..1960d956c6719c5ea8b979c21a6d73beb15c76ba 100644 (file)
@@ -641,9 +641,9 @@ static void mvs_pci_remove(struct pci_dev *pdev)
        tasklet_kill(&((struct mvs_prv_info *)sha->lldd_ha)->mv_tasklet);
 #endif
 
+       scsi_remove_host(mvi->shost);
        sas_unregister_ha(sha);
        sas_remove_host(mvi->shost);
-       scsi_remove_host(mvi->shost);
 
        MVS_CHIP_DISP->interrupt_disable(mvi);
        free_irq(mvi->pdev->irq, sha);