| From 98883f1b5415ea9dce60d5178877d15f4faa10b8 Mon Sep 17 00:00:00 2001 |
| From: "Bryant G. Ly" <bryantly@linux.vnet.ibm.com> |
| Date: Tue, 9 May 2017 11:50:26 -0500 |
| Subject: ibmvscsis: Clear left-over abort_cmd pointers |
| |
| From: Bryant G. Ly <bryantly@linux.vnet.ibm.com> |
| |
| commit 98883f1b5415ea9dce60d5178877d15f4faa10b8 upstream. |
| |
| With the addition of ibmvscsis->abort_cmd pointer within |
| commit 25e78531268e ("ibmvscsis: Do not send aborted task response"), |
| make sure to explicitly NULL these pointers when clearing |
| DELAY_SEND flag. |
| |
| Do this for two cases, when getting the new new ibmvscsis |
| descriptor in ibmvscsis_get_free_cmd() and before posting |
| the response completion in ibmvscsis_send_messages(). |
| |
| Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com> |
| Reviewed-by: Michael Cyr <mikecyr@linux.vnet.ibm.com> |
| Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c |
| +++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c |
| @@ -1169,6 +1169,8 @@ static struct ibmvscsis_cmd *ibmvscsis_g |
| cmd = list_first_entry_or_null(&vscsi->free_cmd, |
| struct ibmvscsis_cmd, list); |
| if (cmd) { |
| + if (cmd->abort_cmd) |
| + cmd->abort_cmd = NULL; |
| cmd->flags &= ~(DELAY_SEND); |
| list_del(&cmd->list); |
| cmd->iue = iue; |
| @@ -1773,6 +1775,7 @@ static void ibmvscsis_send_messages(stru |
| if (cmd->abort_cmd) { |
| retry = true; |
| cmd->abort_cmd->flags &= ~(DELAY_SEND); |
| + cmd->abort_cmd = NULL; |
| } |
| |
| /* |
