diff options
author | Brian King <brking@linux.vnet.ibm.com> | 2014-05-23 10:52:10 -0500 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-06-25 13:29:32 +0200 |
commit | 9ee755974bea2f9880e517ec985dc9dede1b3a36 (patch) | |
tree | 6c4fa81739927a22a6b8230422ca8e4cdb8c0faa /drivers/scsi/ibmvscsi/ibmvscsi.c | |
parent | 33a5fcee7f5d4920ff33997169e02cc34cbab6e6 (diff) | |
download | op-kernel-dev-9ee755974bea2f9880e517ec985dc9dede1b3a36.zip op-kernel-dev-9ee755974bea2f9880e517ec985dc9dede1b3a36.tar.gz |
ibmvscsi: Abort init sequence during error recovery
If a CRQ reset is triggered for some reason while in the middle
of performing VSCSI adapter initialization, we don't want to
call the done function for the initialization MAD commands as
this will only result in two threads attempting initialization
at the same time, resulting in failures.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Acked-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Cc: stable@vger.kernel.org
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/ibmvscsi/ibmvscsi.c')
-rw-r--r-- | drivers/scsi/ibmvscsi/ibmvscsi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index 2ebfb2b..9caf9a9 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c @@ -797,7 +797,8 @@ static void purge_requests(struct ibmvscsi_host_data *hostdata, int error_code) evt->hostdata->dev); if (evt->cmnd_done) evt->cmnd_done(evt->cmnd); - } else if (evt->done) + } else if (evt->done && evt->crq.format != VIOSRP_MAD_FORMAT && + evt->iu.srp.login_req.opcode != SRP_LOGIN_REQ) evt->done(evt); free_event_struct(&evt->hostdata->pool, evt); spin_lock_irqsave(hostdata->host->host_lock, flags); |