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

Revert "RDMA/srp: Do not call scsi_done() from srp_abort()"

Browse Source 
This reverts commit b9bdffb3f9 which is
commit e193b7955d upstream.

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

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

16
drivers/infiniband/ulp/srp/ib_srp.c
View File

@@ -2783,6 +2783,7 @@ static int srp_abort(struct scsi_cmnd *scmnd)
u32 tag;
u16 ch_idx;
struct srp_rdma_ch *ch;
int ret;
shost_printk(KERN_ERR, target->scsi_host, "SRP abort called\n");
@@ -2796,14 +2797,19 @@ static int srp_abort(struct scsi_cmnd *scmnd)
shost_printk(KERN_ERR, target->scsi_host,
"Sending SRP abort for tag %#x\n", tag);
if (srp_send_tsk_mgmt(ch, tag, scmnd->device->lun,
SRP_TSK_ABORT_TASK, NULL) == 0) {
SRP_TSK_ABORT_TASK, NULL) == 0)
ret = SUCCESS;
else if (target->rport->state == SRP_RPORT_LOST)
ret = FAST_IO_FAIL;
else
ret = FAILED;
if (ret == SUCCESS) {
srp_free_req(ch, req, scmnd, 0);
return SUCCESS;
scmnd->result = DID_ABORT << 16;
scsi_done(scmnd);
}
if (target->rport->state == SRP_RPORT_LOST)
return FAST_IO_FAIL;
return FAILED;
return ret;
}
static int srp_reset_device(struct scsi_cmnd *scmnd)