Skip to content

Commit b4730f4

Browse files
shivasharan-sgregkh
authored andcommitted
scsi: megaraid_sas: Return pended IOCTLs with cmd_status MFI_STAT_WRONG_STATE in case adapter is dead
commit eb3fe263a48b0d27b229c213929c4cb3b1b39a0f upstream. After a kill adapter, since the cmd_status is not set, the IOCTLs will be hung in driver resulting in application hang. Set cmd_status MFI_STAT_WRONG_STATE when completing pended IOCTLs. Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com> Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com> Reviewed-by: Hannes Reinecke <hare@suse.com> Reviewed-by: Tomas Henzl <thenzl@redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d9b8f1c commit b4730f4

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/scsi/megaraid/megaraid_sas_base.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1824,9 +1824,12 @@ static void megasas_complete_outstanding_ioctls(struct megasas_instance *instanc
18241824
if (cmd_fusion->sync_cmd_idx != (u32)ULONG_MAX) {
18251825
cmd_mfi = instance->cmd_list[cmd_fusion->sync_cmd_idx];
18261826
if (cmd_mfi->sync_cmd &&
1827-
cmd_mfi->frame->hdr.cmd != MFI_CMD_ABORT)
1827+
(cmd_mfi->frame->hdr.cmd != MFI_CMD_ABORT)) {
1828+
cmd_mfi->frame->hdr.cmd_status =
1829+
MFI_STAT_WRONG_STATE;
18281830
megasas_complete_cmd(instance,
18291831
cmd_mfi, DID_OK);
1832+
}
18301833
}
18311834
}
18321835
} else {

0 commit comments

Comments
 (0)