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>

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 60d7b493ed2dc1d149e756338894cce34a806483..02a3169b2fd640d64d1fceea19cfc4a50f04c2a3 100644 (file)
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -2656,9 +2656,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;
 }