diff options
| author | Bart Van Assche <bart.vanassche@wdc.com> | 2018-02-23 14:09:24 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-24 09:32:08 +0200 |
| commit | 6931ced5d5ad430f2c7f6d2d7ca52c1058482a3c (patch) | |
| tree | 8d0669a87d2b846ab37bb1995d18536ba916bc46 | |
| parent | bb256eeaec50d26413822ab8ef1fa51789fa0a2c (diff) | |
| download | linux-stable-6931ced5d5ad430f2c7f6d2d7ca52c1058482a3c.tar.gz linux-stable-6931ced5d5ad430f2c7f6d2d7ca52c1058482a3c.tar.bz2 linux-stable-6931ced5d5ad430f2c7f6d2d7ca52c1058482a3c.zip | |
IB/srp: Fix srp_abort()
commit e68088e78d82920632eba112b968e49d588d02a2 upstream.
Before commit e494f6a72839 ("[SCSI] improved eh timeout handler") it
did not really matter whether or not abort handlers like srp_abort()
called .scsi_done() when returning another value than SUCCESS. Since
that commit however this matters. Hence only call .scsi_done() when
returning SUCCESS.
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/infiniband/ulp/srp/ib_srp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index 9a99cee2665a..ba51debef624 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -2581,9 +2581,11 @@ static int srp_abort(struct scsi_cmnd *scmnd) ret = FAST_IO_FAIL; else ret = FAILED; - srp_free_req(ch, req, scmnd, 0); - scmnd->result = DID_ABORT << 16; - scmnd->scsi_done(scmnd); + if (ret == SUCCESS) { + srp_free_req(ch, req, scmnd, 0); + scmnd->result = DID_ABORT << 16; + scmnd->scsi_done(scmnd); + } return ret; } |