lkml.org 
[lkml]   [2011]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[172/244] [SCSI] mpt2sas: Added DID_NO_CONNECT return when driver remove and avoid shutdown call
    3.0-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: "Kashyap, Desai" <kashyap.desai@lsi.com>

    commit 7821578caa8cb831868989041112ab808029ca65 upstream.

    Driver should not call shutdown call from _scsih_remove otherwise,
    The scsi midlayer can be deadlocked when devices are removed from the driver
    pci_driver->shutdown handler.

    Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
    Signed-off-by: James Bottomley <JBottomley@Parallels.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/scsi/mpt2sas/mpt2sas_scsih.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
    +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
    @@ -3698,7 +3698,7 @@ _scsih_qcmd_lck(struct scsi_cmnd *scmd,
    return 0;
    }

    - if (ioc->pci_error_recovery) {
    + if (ioc->pci_error_recovery || ioc->remove_host) {
    scmd->result = DID_NO_CONNECT << 16;
    scmd->scsi_done(scmd);
    return 0;
    @@ -7211,7 +7211,6 @@ _scsih_remove(struct pci_dev *pdev)
    }

    sas_remove_host(shost);
    - _scsih_shutdown(pdev);
    list_del(&ioc->list);
    scsi_remove_host(shost);
    scsi_host_put(shost);



    \
     
     \ /
      Last update: 2011-09-29 01:09    [W:0.021 / U:60.580 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site