| From beb74d174ea931cb329f3ac35476ce44cb03bb50 Mon Sep 17 00:00:00 2001 |
| From: Bart Van Assche <bvanassche@acm.org> |
| Date: Wed, 17 Apr 2019 14:44:28 -0700 |
| Subject: scsi: qla2xxx: Fix abort handling in tcm_qla2xxx_write_pending() |
| |
| [ Upstream commit e209783d66bca04b5fce4429e59338517ffc1a0b ] |
| |
| Implementations of the .write_pending() callback functions must guarantee |
| that an appropriate LIO core callback function will be called immediately or |
| at a later time. Make sure that this guarantee is met for aborted SCSI |
| commands. |
| |
| [mkp: typo] |
| |
| Cc: Himanshu Madhani <hmadhani@marvell.com> |
| Cc: Giridhar Malavali <gmalavali@marvell.com> |
| Fixes: 694833ee00c4 ("scsi: tcm_qla2xxx: Do not allow aborted cmd to advance.") # v4.13. |
| Fixes: a07100e00ac4 ("qla2xxx: Fix TMR ABORT interaction issue between qla2xxx and TCM") # v4.5. |
| Signed-off-by: Bart Van Assche <bvanassche@acm.org> |
| Acked-by: Himanshu Madhani <hmadhani@marvell.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c |
| index 8a3075d17c63c..bddb573c88dd2 100644 |
| --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c |
| +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c |
| @@ -399,6 +399,8 @@ static int tcm_qla2xxx_write_pending(struct se_cmd *se_cmd) |
| cmd->se_cmd.transport_state, |
| cmd->se_cmd.t_state, |
| cmd->se_cmd.se_cmd_flags); |
| + transport_generic_request_failure(&cmd->se_cmd, |
| + TCM_CHECK_CONDITION_ABORT_CMD); |
| return 0; |
| } |
| cmd->trc_flags |= TRC_XFR_RDY; |
| -- |
| 2.20.1 |
| |
