From e6ac85312bd95b42e5a57ae43f2922a29eaff75d Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Fri, 8 Jan 2010 16:19:31 +0000 Subject: [PATCH] Commands can be aborted by other transports, so cmnd_rx_continue() should check scst_cmd_aborted(). git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1439 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/iscsi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c index 79e724a68..2c5c01c1c 100644 --- a/iscsi-scst/kernel/iscsi.c +++ b/iscsi-scst/kernel/iscsi.c @@ -1648,7 +1648,10 @@ int cmnd_rx_continue(struct iscsi_cmnd *req) /* Check prelim_compl_flags here to save R2Ts */ if (unlikely(scst_cmd_completed(scst_cmd) || - unlikely(req->prelim_compl_flags != 0))) { + unlikely(req->prelim_compl_flags != 0) || + unlikely(scst_cmd_aborted(scst_cmd)))) { + if (scst_cmd_aborted(scst_cmd)) + set_bit(ISCSI_CMD_ABORTED, &req->prelim_compl_flags); res = iscsi_preliminary_complete(req, req, true); goto trace; }