]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
isci: remove SCSI host before detaching from SAS transport
authorJack Wang <jinpu.wang@profitbricks.com>
Thu, 5 Nov 2015 11:32:29 +0000 (12:32 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 10 Nov 2015 00:36:04 +0000 (19:36 -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/isci/init.c

index 0dfcabe3ca7c2c7862b3712a391f2cd4ba19015a..9e0d069f987bd9d382249367491f710ede330233 100644 (file)
@@ -272,11 +272,11 @@ static void isci_unregister(struct isci_host *isci_host)
        if (!isci_host)
                return;
 
+       shost = to_shost(isci_host);
+       scsi_remove_host(shost);
        sas_unregister_ha(&isci_host->sas_ha);
 
-       shost = to_shost(isci_host);
        sas_remove_host(shost);
-       scsi_remove_host(shost);
        scsi_host_put(shost);
 }