Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-07 17:42:33 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-08 09:43:05 +0100
commit2329bcacd042a021c4b449d805f194851408d19b (patch)
treee43b18f8c04f60c0d382cd42f3e625bc9f42e4be
parent6ae2b0084f9ed794c7dfb4d31db0391bd6a8082c (diff)
Fix "qla2xxx: terminate exchange when command is aborted by LIO"
This fixes commit f67924cc39badbc813bd1935f9a025065a6a6534 which was commit 7359df25a53386dd33c223672bbd12cb49d0ce4f upstream. When backporting the patch, there was an unused variable, and the printk type was incorrect. Fix this up by moving back to the correct type as shown in commit 649ee05499d1257a3af0e10d961a1c52d9ef95b7 and remove the unneeded variable. This fixes up two build warnings. Cc: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/scsi/qla2xxx/qla_target.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 9f296dfeeb7f..1c965e0325af 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -3075,11 +3075,10 @@ void qlt_abort_cmd(struct qla_tgt_cmd *cmd)
{
struct qla_tgt *tgt = cmd->tgt;
struct scsi_qla_host *vha = tgt->vha;
- struct se_cmd *se_cmd = &cmd->se_cmd;
ql_dbg(ql_dbg_tgt_mgt, vha, 0xf014,
"qla_target(%d): terminating exchange for aborted cmd=%p "
- "(se_cmd=%p, tag=%llu)", vha->vp_idx, cmd, &cmd->se_cmd,
+ "(se_cmd=%p, tag=%d)", vha->vp_idx, cmd, &cmd->se_cmd,
cmd->tag);
cmd->state = QLA_TGT_STATE_ABORTED;