shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-26 20:40:24 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "scsi: ib_srp: Call scsi_done() directly"

Browse Source 
This reverts commit 7d4999589e which is
commit 5f9ae9eecb upstream.

It breaks the Android KABI and is not needed at this time for any
Android-relevant systems.

Bug: 161946584
Change-Id: I4fc8f2c46f9c0ab0da91134905ab549e39faf378
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-10-24 17:57:12 +00:00
parent 52a4732da9
commit d22695f24c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/infiniband/ulp/srp/ib_srp.c
View 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;
scsi_done(scmnd);
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));
scsi_done(scmnd);
scmnd->scsi_done(scmnd);
}
}
@@ -2236,7 +2236,7 @@ err_iu:
err:
if (scmnd->result) {
scsi_done(scmnd);
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;
scsi_done(scmnd);
scmnd->scsi_done(scmnd);
}
return ret;