diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:20:52 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:20:52 +0800 |
| commit | 054f8fe34189a62a0b87700c062a18c3a8421615 (patch) | |
| tree | 805b9cc11d537a66870978b1ea51fc66c5a8f9a9 /drivers/scsi/qla2xxx/qla_target.c | |
| parent | 108df9c204f549150c7e1e3262ffd19bd624269e (diff) | |
| parent | 53752ea210016b548cfc3898e6a5ea338fcb6c2c (diff) | |
Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18lsk-v3.18-17.03lsk-v3.18-17.02
Conflicts:
arch/x86/boot/compressed/misc.h
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_target.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_target.c | 3 |
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; |