mpt3sas, mpt2sas: fix scsi_add_host error handling problems in _scsih_probe

In _scsih_probe, propagate the return value from scsi_add_host.
In mpt3sas, avoid calling list_del twice if that returns an
error, which causes list_del corruption warnings if an error
is returned.

Tested with blk-mq and scsi-mq patches to properly cleanup
from and propagate blk_mq_init_rq_map errors.

Signed-off-by: Robert Elliott <elliott@hp.com>
Acked-by: Sreekanth Reddy <Sreekanth.Reddy@avagotech.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index 231ec34d8ea9fc8707b79ff7e094886d9ecb77d1..992a224e51ee4ff17021e10bf203197a42cf449e 100644 (file)
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -8147,6 +8147,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
        struct MPT2SAS_ADAPTER *ioc;
        struct Scsi_Host *shost;
+       int rv;
 
        shost = scsi_host_alloc(&scsih_driver_template,
            sizeof(struct MPT2SAS_ADAPTER));
@@ -8242,6 +8243,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        if (!ioc->firmware_event_thread) {
                printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n",
                    ioc->name, __FILE__, __LINE__, __func__);
+               rv = -ENODEV;
                goto out_thread_fail;
        }
 
@@ -8249,6 +8251,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        if ((mpt2sas_base_attach(ioc))) {
                printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n",
                    ioc->name, __FILE__, __LINE__, __func__);
+               rv = -ENODEV;
                goto out_attach_fail;
        }
 
@@ -8266,7 +8269,8 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        } else
                ioc->hide_drives = 0;
 
-       if ((scsi_add_host(shost, &pdev->dev))) {
+       rv = scsi_add_host(shost, &pdev->dev);
+       if (rv) {
                printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n",
                    ioc->name, __FILE__, __LINE__, __func__);
                goto out_add_shost_fail;
@@ -8283,7 +8287,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
  out_thread_fail:
        list_del(&ioc->list);
        scsi_host_put(shost);
-       return -ENODEV;
+       return rv;
 }
 
 #ifdef CONFIG_PM

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 95a1049472f04c4c13100f8dc0edae05b3c6e114..857276b8880f4b94e8578bdc237cc9683d180c29 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -7781,6 +7781,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
        struct MPT3SAS_ADAPTER *ioc;
        struct Scsi_Host *shost;
+       int rv;
 
        shost = scsi_host_alloc(&scsih_driver_template,
            sizeof(struct MPT3SAS_ADAPTER));
@@ -7873,6 +7874,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        if (!ioc->firmware_event_thread) {
                pr_err(MPT3SAS_FMT "failure at %s:%d/%s()!\n",
                    ioc->name, __FILE__, __LINE__, __func__);
+               rv = -ENODEV;
                goto out_thread_fail;
        }
 
@@ -7880,12 +7882,13 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        if ((mpt3sas_base_attach(ioc))) {
                pr_err(MPT3SAS_FMT "failure at %s:%d/%s()!\n",
                    ioc->name, __FILE__, __LINE__, __func__);
+               rv = -ENODEV;
                goto out_attach_fail;
        }
-       if ((scsi_add_host(shost, &pdev->dev))) {
+       rv = scsi_add_host(shost, &pdev->dev);
+       if (rv) {
                pr_err(MPT3SAS_FMT "failure at %s:%d/%s()!\n",
                    ioc->name, __FILE__, __LINE__, __func__);
-               list_del(&ioc->list);
                goto out_add_shost_fail;
        }
 
@@ -7898,7 +7901,7 @@ out_add_shost_fail:
  out_thread_fail:
        list_del(&ioc->list);
        scsi_host_put(shost);
-       return -ENODEV;
+       return rv;
 }
 
 #ifdef CONFIG_PM