]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: ib_srp: Call scsi_done() directly
authorBart Van Assche <bvanassche@acm.org>
Thu, 7 Oct 2021 20:28:00 +0000 (13:28 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Oct 2023 21:05:32 +0000 (23:05 +0200)
[ Upstream commit 5f9ae9eecb15ef00d89a5884add1117a8e634e7f ]

Conditional statements are faster than indirect calls. Hence call
scsi_done() directly.

Link: https://lore.kernel.org/r/20211007202923.2174984-6-bvanassche@acm.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Stable-dep-of: e193b7955dfa ("RDMA/srp: Do not call scsi_done() from srp_abort()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/ulp/srp/ib_srp.c

index 7701204fe542363eb63a802794157fa5cda79939..df7c740e26338a5b50543e83b6de7c5763c7443d 100644 (file)
@@ -1266,7 +1266,7 @@ static void srp_finish_req(struct srp_rdma_ch *ch, struct srp_request *req,
        if (scmnd) {
                srp_free_req(ch, req, scmnd, 0);
                scmnd->result = result;
-               scmnd->scsi_done(scmnd);
+               scsi_done(scmnd);
        }
 }
 
@@ -1984,7 +1984,7 @@ static void srp_process_rsp(struct srp_rdma_ch *ch, struct srp_rsp *rsp)
                srp_free_req(ch, req, scmnd,
                             be32_to_cpu(rsp->req_lim_delta));
 
-               scmnd->scsi_done(scmnd);
+               scsi_done(scmnd);
        }
 }
 
@@ -2236,7 +2236,7 @@ err_iu:
 
 err:
        if (scmnd->result) {
-               scmnd->scsi_done(scmnd);
+               scsi_done(scmnd);
                ret = 0;
        } else {
                ret = SCSI_MLQUEUE_HOST_BUSY;
@@ -2806,7 +2806,7 @@ static int srp_abort(struct scsi_cmnd *scmnd)
        if (ret == SUCCESS) {
                srp_free_req(ch, req, scmnd, 0);
                scmnd->result = DID_ABORT << 16;
-               scmnd->scsi_done(scmnd);
+               scsi_done(scmnd);
        }
 
        return ret;