aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/target
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-13 15:00:02 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-13 15:00:02 -0500
commita2013a13e68354e0c8f3696b69701803e13fb737 (patch)
treea7e1da6bfad1aa2afd83f401874d606269ce90b4 /drivers/target
parentdadfab4873256d2145640c0ce468fcbfb48977fe (diff)
parent106f9d9337f65bd428c0c79f650e3489e458d771 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina: "Usual stuff -- comment/printk typo fixes, documentation updates, dead code elimination." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) HOWTO: fix double words typo x86 mtrr: fix comment typo in mtrr_bp_init propagate name change to comments in kernel source doc: Update the name of profiling based on sysfs treewide: Fix typos in various drivers treewide: Fix typos in various Kconfig wireless: mwifiex: Fix typo in wireless/mwifiex driver messages: i2o: Fix typo in messages/i2o scripts/kernel-doc: check that non-void fcts describe their return value Kernel-doc: Convention: Use a "Return" section to describe return values radeon: Fix typo and copy/paste error in comments doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c various: Fix spelling of "asynchronous" in comments. Fix misspellings of "whether" in comments. eisa: Fix spelling of "asynchronous". various: Fix spelling of "registered" in comments. doc: fix quite a few typos within Documentation target: iscsi: fix comment typos in target/iscsi drivers treewide: fix typo of "suport" in various comments and Kconfig treewide: fix typo of "suppport" in various comments ...
Diffstat (limited to 'drivers/target')
-rw-r--r--drivers/target/iscsi/iscsi_target_configfs.c2
-rw-r--r--drivers/target/iscsi/iscsi_target_erl0.c6
-rw-r--r--drivers/target/iscsi/iscsi_target_parameters.c1
-rw-r--r--drivers/target/iscsi/iscsi_target_util.c2
4 files changed, 6 insertions, 5 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(
235 * iSER/SCTP (TODO, software emulation with osc-iwarp) 235 * iSER/SCTP (TODO, software emulation with osc-iwarp)
236 * iSER/IB (TODO, hardware available) 236 * iSER/IB (TODO, hardware available)
237 * 237 *
238 * can be enabled with atributes under 238 * can be enabled with attributes under
239 * sys/kernel/config/iscsi/$IQN/$TPG/np/$IP:$PORT/ 239 * sys/kernel/config/iscsi/$IQN/$TPG/np/$IP:$PORT/
240 * 240 *
241 */ 241 */
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(
410 /* 410 /*
411 * For DataSequenceInOrder=Yes: If the offset is greater than the global 411 * For DataSequenceInOrder=Yes: If the offset is greater than the global
412 * DataPDUInOrder=Yes offset counter in struct iscsi_cmd a protcol error has 412 * DataPDUInOrder=Yes offset counter in struct iscsi_cmd a protcol error has
413 * occured and fail the connection. 413 * occurred and fail the connection.
414 * 414 *
415 * For DataSequenceInOrder=No: If the offset is greater than the per 415 * For DataSequenceInOrder=No: If the offset is greater than the per
416 * sequence DataPDUInOrder=Yes offset counter in struct iscsi_seq a protocol 416 * sequence DataPDUInOrder=Yes offset counter in struct iscsi_seq a protocol
417 * error has occured and fail the connection. 417 * error has occurred and fail the connection.
418 */ 418 */
419 if (conn->sess->sess_ops->DataSequenceInOrder) { 419 if (conn->sess->sess_ops->DataSequenceInOrder) {
420 if (be32_to_cpu(hdr->offset) != cmd->write_data_done) { 420 if (be32_to_cpu(hdr->offset) != cmd->write_data_done) {
@@ -801,7 +801,7 @@ void iscsit_start_time2retain_handler(struct iscsi_session *sess)
801{ 801{
802 int tpg_active; 802 int tpg_active;
803 /* 803 /*
804 * Only start Time2Retain timer when the assoicated TPG is still in 804 * Only start Time2Retain timer when the associated TPG is still in
805 * an ACTIVE (eg: not disabled or shutdown) state. 805 * an ACTIVE (eg: not disabled or shutdown) state.
806 */ 806 */
807 spin_lock(&ISCSI_TPG_S(sess)->tpg_state_lock); 807 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(
1432 break; 1432 break;
1433 case PHASE_OPERATIONAL: 1433 case PHASE_OPERATIONAL:
1434 pr_debug("Operational phase.\n"); 1434 pr_debug("Operational phase.\n");
1435 break;
1435 default: 1436 default:
1436 pr_debug("Unknown phase.\n"); 1437 pr_debug("Unknown phase.\n");
1437 } 1438 }
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)
684void iscsit_free_cmd(struct iscsi_cmd *cmd) 684void iscsit_free_cmd(struct iscsi_cmd *cmd)
685{ 685{
686 /* 686 /*
687 * Determine if a struct se_cmd is assoicated with 687 * Determine if a struct se_cmd is associated with
688 * this struct iscsi_cmd. 688 * this struct iscsi_cmd.
689 */ 689 */
690 switch (cmd->iscsi_opcode) { 690 switch (cmd->iscsi_opcode) {