diff options
Diffstat (limited to 'drivers/target')
| -rw-r--r-- | drivers/target/iscsi/iscsi_target_configfs.c | 2 | ||||
| -rw-r--r-- | drivers/target/iscsi/iscsi_target_erl0.c | 6 | ||||
| -rw-r--r-- | drivers/target/iscsi/iscsi_target_parameters.c | 1 | ||||
| -rw-r--r-- | drivers/target/iscsi/iscsi_target_util.c | 2 | ||||
| -rw-r--r-- | drivers/target/target_core_transport.c | 6 |
5 files changed, 10 insertions, 7 deletions
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c index ff6fd4fb624d..0f03b7919d7c 100644 --- a/drivers/target/iscsi/iscsi_target_configfs.c +++ b/drivers/target/iscsi/iscsi_target_configfs.c @@ -235,7 +235,7 @@ static struct se_tpg_np *lio_target_call_addnptotpg( * iSER/SCTP (TODO, software emulation with osc-iwarp) * iSER/IB (TODO, hardware available) * - * can be enabled with atributes under + * can be enabled with attributes under * sys/kernel/config/iscsi/$IQN/$TPG/np/$IP:$PORT/ * */ diff --git a/drivers/target/iscsi/iscsi_target_erl0.c b/drivers/target/iscsi/iscsi_target_erl0.c index 8aacf611b86d..8e6298cc8839 100644 --- a/drivers/target/iscsi/iscsi_target_erl0.c +++ b/drivers/target/iscsi/iscsi_target_erl0.c @@ -410,11 +410,11 @@ static int iscsit_dataout_pre_datapduinorder_yes( /* * For DataSequenceInOrder=Yes: If the offset is greater than the global * DataPDUInOrder=Yes offset counter in struct iscsi_cmd a protcol error has - * occured and fail the connection. + * occurred and fail the connection. * * For DataSequenceInOrder=No: If the offset is greater than the per * sequence DataPDUInOrder=Yes offset counter in struct iscsi_seq a protocol - * error has occured and fail the connection. + * error has occurred and fail the connection. */ if (conn->sess->sess_ops->DataSequenceInOrder) { if (be32_to_cpu(hdr->offset) != cmd->write_data_done) { @@ -801,7 +801,7 @@ void iscsit_start_time2retain_handler(struct iscsi_session *sess) { int tpg_active; /* - * Only start Time2Retain timer when the assoicated TPG is still in + * Only start Time2Retain timer when the associated TPG is still in * an ACTIVE (eg: not disabled or shutdown) state. */ spin_lock(&ISCSI_TPG_S(sess)->tpg_state_lock); diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c index 90b740048f26..1bf7432bfcbc 100644 --- a/drivers/target/iscsi/iscsi_target_parameters.c +++ b/drivers/target/iscsi/iscsi_target_parameters.c @@ -1432,6 +1432,7 @@ static struct iscsi_param *iscsi_check_key( break; case PHASE_OPERATIONAL: pr_debug("Operational phase.\n"); + break; default: pr_debug("Unknown phase.\n"); } diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c index 1a91195ab619..69e0cfd98870 100644 --- a/drivers/target/iscsi/iscsi_target_util.c +++ b/drivers/target/iscsi/iscsi_target_util.c @@ -684,7 +684,7 @@ void iscsit_release_cmd(struct iscsi_cmd *cmd) void iscsit_free_cmd(struct iscsi_cmd *cmd) { /* - * Determine if a struct se_cmd is assoicated with + * Determine if a struct se_cmd is associated with * this struct iscsi_cmd. */ switch (cmd->iscsi_opcode) { diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 9097155e9ebe..dcecbfb17243 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -1819,8 +1819,10 @@ void target_execute_cmd(struct se_cmd *cmd) /* * If the received CDB has aleady been aborted stop processing it here. */ - if (transport_check_aborted_status(cmd, 1)) + if (transport_check_aborted_status(cmd, 1)) { + complete(&cmd->t_transport_stop_comp); return; + } /* * Determine if IOCTL context caller in requesting the stopping of this @@ -3067,7 +3069,7 @@ void transport_send_task_abort(struct se_cmd *cmd) unsigned long flags; spin_lock_irqsave(&cmd->t_state_lock, flags); - if (cmd->se_cmd_flags & SCF_SENT_CHECK_CONDITION) { + if (cmd->se_cmd_flags & (SCF_SENT_CHECK_CONDITION | SCF_SENT_DELAYED_TAS)) { spin_unlock_irqrestore(&cmd->t_state_lock, flags); return; } |