iscsi-target: Fix indentation + spelling + unreachable code

Modify indentation such that the 'smatch' tool no longer complains
about incorrect indentation + unreachable code.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Reviewed-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 342a07c58d89400643b26236875d6ffa6a91062e..a81c0e5ca2932f582f29dca80bfdc0a9c7f8ee74 100644 (file)
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -1333,7 +1333,7 @@ iscsit_check_dataout_hdr(struct iscsi_conn *conn, unsigned char *buf,
                        /*
                         * Check if a delayed TASK_ABORTED status needs to
                         * be sent now if the ISCSI_FLAG_CMD_FINAL has been
-                        * received with the unsolicitied data out.
+                        * received with the unsolicited data out.
                         */
                        if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
                                iscsit_stop_dataout_timer(cmd);
@@ -4448,9 +4448,6 @@ int iscsit_close_connection(
 
                return 0;
        }
-       spin_unlock_bh(&sess->conn_lock);
-
-       return 0;
 }
 
 int iscsit_close_session(struct iscsi_session *sess)

diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c
index 2e561deb30a2b6cd53f186b0e388311da35ad439..9214c9dafa2be56082b792eaccd31ca87420b59e 100644 (file)
--- a/drivers/target/iscsi/iscsi_target_erl1.c
+++ b/drivers/target/iscsi/iscsi_target_erl1.c
@@ -160,8 +160,7 @@ static int iscsit_handle_r2t_snack(
                        " protocol error.\n", cmd->init_task_tag, begrun,
                        (begrun + runlength), cmd->acked_data_sn);
 
-                       return iscsit_reject_cmd(cmd,
-                                       ISCSI_REASON_PROTOCOL_ERROR, buf);
+               return iscsit_reject_cmd(cmd, ISCSI_REASON_PROTOCOL_ERROR, buf);
        }
 
        if (runlength) {
@@ -628,8 +627,8 @@ int iscsit_dataout_datapduinorder_no_fbit(
                        if (cmd->pdu_list[i].seq_no == pdu->seq_no) {
                                if (!first_pdu)
                                        first_pdu = &cmd->pdu_list[i];
-                                xfer_len += cmd->pdu_list[i].length;
-                                pdu_count++;
+                               xfer_len += cmd->pdu_list[i].length;
+                               pdu_count++;
                        } else if (pdu_count)
                                break;
                }

diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c
index 51d1734d5390409e2c98a34c4ad9fc787c1fc362..1aa6c2b5abbe844a5f0c9e3ac4b4c00e06b17b1b 100644 (file)
--- a/drivers/target/iscsi/iscsi_target_parameters.c
+++ b/drivers/target/iscsi/iscsi_target_parameters.c
@@ -1668,7 +1668,7 @@ void iscsi_set_session_parameters(
                                param->value);
                } else if (!strcmp(param->name, INITIALR2T)) {
                        ops->InitialR2T = !strcmp(param->value, YES);
-                        pr_debug("InitialR2T:                   %s\n",
+                       pr_debug("InitialR2T:                   %s\n",
                                param->value);
                } else if (!strcmp(param->name, IMMEDIATEDATA)) {
                        ops->ImmediateData = !strcmp(param->value, YES);

diff --git a/drivers/target/iscsi/iscsi_target_tmr.c b/drivers/target/iscsi/iscsi_target_tmr.c
index 11320df939f7f19d5406fc857bc5e69b160f9593..3d637055c36f051da62a9a172060de1aa22ab839 100644 (file)
--- a/drivers/target/iscsi/iscsi_target_tmr.c
+++ b/drivers/target/iscsi/iscsi_target_tmr.c
@@ -82,7 +82,7 @@ int iscsit_tmr_task_warm_reset(
                pr_err("TMR Opcode TARGET_WARM_RESET authorization"
                        " failed for Initiator Node: %s\n",
                        sess->se_sess->se_node_acl->initiatorname);
-                return -1;
+               return -1;
        }
        /*
         * Do the real work in transport_generic_do_tmr().