Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

Pull SCSI target updates from Nicholas Bellinger:
 "This contains the usual set of updates and bugfixes to target-core +
  existing fabric module code, along with a handful of the patches
  destined for v3.3 stable.

  It also contains the necessary target-core infrastructure pieces
  required to run using tcm_qla2xxx.ko WWPNs with the new Qlogic Fibre
  Channel fabric module currently queued in target-pending/for-next-merge,
  and coming for round 2.

  The highlights for this series include:

   - Add target_submit_tmr() helper function for fabric task management
     (andy)
   - Convert tcm_fc to use target_submit_tmr() (andy)
   - Replace target core various cmd flags with a transport state (hch)
   - Convert loopback to use workqueue submission (hch)
   - Convert target core to use array_zalloc for tpg_lun_list (joern)
   - Convert target core to use array_zalloc for device_list (joern)
   - Add target core support for TMR_ABORT_TASK (nab)
   - Add target core se_sess->sess_kref + get/put helpers (nab)
   - Add target core se_node_acl->acl_kref for ->acl_free_comp usage
     (nab)
   - Convert iscsi-target to use target_put_session + sess_kref (nab)
   - Fix tcm_fc fc_exch memory leak in ft_send_resp_status (nab)
   - Fix ib_srpt srpt_handle_cmd send_ioctx->ioctx_kref leak on
     exception (nab)
   - Fix target core up handling of short INQUIRY buffers (roland)
   - Untangle target-core front-end and back-end meanings of max_sectors
     attribute (roland)
   - Set loopback residual field for SCSI commands (roland)
   - Fix target-core 16-bit target ports for SET TARGET PORT GROUPS
     emulation (roland)

  Thanks again to Andy, Christoph, Joern, Roland, and everyone who has
  contributed this round!"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (64 commits)
  ib_srpt: Fix srpt_handle_cmd send_ioctx->ioctx_kref leak on exception
  loopback: Fix transport_generic_allocate_tasks error handling
  iscsi-target: remove improper externs
  iscsi-target: Remove unused variables in iscsi_target_parameters.c
  target: remove obvious warnings
  target: Use array_zalloc for device_list
  target: Use array_zalloc for tpg_lun_list
  target: Fix sense code for unsupported SERVICE ACTION IN
  target: Remove hack to make READ CAPACITY(10) lie if thin provisioning is enabled
  target: Bump core version to v4.1.0-rc2-ml + fabric versions
  tcm_fc: Fix fc_exch memory leak in ft_send_resp_status
  target: Drop unused legacy target_core_fabric_ops API callers
  iscsi-target: Convert to use target_put_session + sess_kref
  target: Convert se_node_acl->acl_group removal to use ->acl_kref
  target: Add se_node_acl->acl_kref for ->acl_free_comp usage
  target: Add se_node_acl->acl_free_comp for NodeACL release path
  target: Add se_sess->sess_kref + get/put helpers
  target: Convert session_lock to irqsave
  target: Fix typo in drivers/target
  iscsi-target: Fix dynamic -> explict NodeACL pointer reference
  ...

14 files changed, 50 insertions, 145 deletions

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 1c6f700f5faa..8b1d5e62ed40 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -781,7 +781,7 @@ static int iscsit_alloc_buffs(struct iscsi_cmd *cmd)
         struct scatterlist *sgl;
         u32 length = cmd->se_cmd.data_length;
         int nents = DIV_ROUND_UP(length, PAGE_SIZE);
-        int i = 0, ret;
+        int i = 0, j = 0, ret;
         /*
          * If no SCSI payload is present, allocate the default iovecs used for
          * iSCSI PDU Header
@@ -822,17 +822,15 @@ static int iscsit_alloc_buffs(struct iscsi_cmd *cmd)
          */
         ret = iscsit_allocate_iovecs(cmd);
         if (ret < 0)
-                goto page_alloc_failed;
+                return -ENOMEM;
 
         return 0;
 
 page_alloc_failed:
-        while (i >= 0) {
-                __free_page(sg_page(&sgl[i]));
-                i--;
-        }
-        kfree(cmd->t_mem_sg);
-        cmd->t_mem_sg = NULL;
+        while (j < i)
+                __free_page(sg_page(&sgl[j++]));
+
+        kfree(sgl);
         return -ENOMEM;
 }
 
@@ -1007,8 +1005,8 @@ done:
         /*
          * The CDB is going to an se_device_t.
          */
-        ret = iscsit_get_lun_for_cmd(cmd, hdr->cdb,
-                                get_unaligned_le64(&hdr->lun));
+        ret = transport_lookup_cmd_lun(&cmd->se_cmd,
+                                       scsilun_to_int(&hdr->lun));
         if (ret < 0) {
                 if (cmd->se_cmd.scsi_sense_reason == TCM_NON_EXISTENT_LUN) {
                         pr_debug("Responding to non-acl'ed,"
@@ -1364,7 +1362,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf)
                  * outstanding_r2ts reaches zero, go ahead and send the delayed
                  * TASK_ABORTED status.
                  */
-                if (atomic_read(&se_cmd->t_transport_aborted) != 0) {
+                if (se_cmd->transport_state & CMD_T_ABORTED) {
                         if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
                                 if (--cmd->outstanding_r2ts < 1) {
                                         iscsit_stop_dataout_timer(cmd);
@@ -1472,14 +1470,12 @@ static int iscsit_handle_nop_out(
         unsigned char *ping_data = NULL;
         int cmdsn_ret, niov = 0, ret = 0, rx_got, rx_size;
         u32 checksum, data_crc, padding = 0, payload_length;
-        u64 lun;
         struct iscsi_cmd *cmd = NULL;
         struct kvec *iov = NULL;
         struct iscsi_nopout *hdr;
 
         hdr                     = (struct iscsi_nopout *) buf;
         payload_length          = ntoh24(hdr->dlength);
-        lun                     = get_unaligned_le64(&hdr->lun);
         hdr->itt                = be32_to_cpu(hdr->itt);
         hdr->ttt                = be32_to_cpu(hdr->ttt);
         hdr->cmdsn              = be32_to_cpu(hdr->cmdsn);
@@ -1689,13 +1685,11 @@ static int iscsit_handle_task_mgt_cmd(
         struct se_tmr_req *se_tmr;
         struct iscsi_tmr_req *tmr_req;
         struct iscsi_tm *hdr;
-        u32 payload_length;
         int out_of_order_cmdsn = 0;
         int ret;
         u8 function;
 
         hdr                     = (struct iscsi_tm *) buf;
-        payload_length          = ntoh24(hdr->dlength);
         hdr->itt                = be32_to_cpu(hdr->itt);
         hdr->rtt                = be32_to_cpu(hdr->rtt);
         hdr->cmdsn              = be32_to_cpu(hdr->cmdsn);
@@ -1747,8 +1741,8 @@ static int iscsit_handle_task_mgt_cmd(
          * Locate the struct se_lun for all TMRs not related to ERL=2 TASK_REASSIGN
          */
         if (function != ISCSI_TM_FUNC_TASK_REASSIGN) {
-                ret = iscsit_get_lun_for_tmr(cmd,
-                                get_unaligned_le64(&hdr->lun));
+                ret = transport_lookup_tmr_lun(&cmd->se_cmd,
+                                               scsilun_to_int(&hdr->lun));
                 if (ret < 0) {
                         cmd->se_cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
                         se_tmr->response = ISCSI_TMF_RSP_NO_LUN;
@@ -2207,14 +2201,10 @@ static int iscsit_handle_snack(
         struct iscsi_conn *conn,
         unsigned char *buf)
 {
-        u32 unpacked_lun;
-        u64 lun;
         struct iscsi_snack *hdr;
 
         hdr                     = (struct iscsi_snack *) buf;
         hdr->flags              &= ~ISCSI_FLAG_CMD_FINAL;
-        lun                     = get_unaligned_le64(&hdr->lun);
-        unpacked_lun            = scsilun_to_int((struct scsi_lun *)&lun);
         hdr->itt                = be32_to_cpu(hdr->itt);
         hdr->ttt                = be32_to_cpu(hdr->ttt);
         hdr->exp_statsn         = be32_to_cpu(hdr->exp_statsn);
@@ -3514,7 +3504,6 @@ int iscsi_target_tx_thread(void *arg)
         struct iscsi_cmd *cmd = NULL;
         struct iscsi_conn *conn;
         struct iscsi_queue_req *qr = NULL;
-        struct se_cmd *se_cmd;
         struct iscsi_thread_set *ts = arg;
         /*
          * Allow ourselves to be interrupted by SIGINT so that a
@@ -3697,8 +3686,6 @@ check_rsp_state:
                                 goto transport_err;
                         }
 
-                        se_cmd = &cmd->se_cmd;
-
                         if (map_sg && !conn->conn_ops->IFMarker) {
                                 if (iscsit_fe_sendpage_sg(cmd, conn) < 0) {
                                         conn->tx_response_queue = 0;
@@ -4171,7 +4158,7 @@ int iscsit_close_connection(
         if (!atomic_read(&sess->session_reinstatement) &&
              atomic_read(&sess->session_fall_back_to_erl0)) {
                 spin_unlock_bh(&sess->conn_lock);
-                iscsit_close_session(sess);
+                target_put_session(sess->se_sess);
 
                 return 0;
         } else if (atomic_read(&sess->session_logout)) {
@@ -4292,7 +4279,7 @@ static void iscsit_logout_post_handler_closesession(
         iscsit_dec_conn_usage_count(conn);
         iscsit_stop_session(sess, 1, 1);
         iscsit_dec_session_usage_count(sess);
-        iscsit_close_session(sess);
+        target_put_session(sess->se_sess);
 }
 
 static void iscsit_logout_post_handler_samecid(
@@ -4458,7 +4445,7 @@ int iscsit_free_session(struct iscsi_session *sess)
         } else
                 spin_unlock_bh(&sess->conn_lock);
 
-        iscsit_close_session(sess);
+        target_put_session(sess->se_sess);
         return 0;
 }
 
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index 6b35b37988ed..00c58cc82c85 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -812,9 +812,6 @@ static struct se_node_acl *lio_target_make_nodeacl(
         if (!se_nacl_new)
                 return ERR_PTR(-ENOMEM);
 
-        acl = container_of(se_nacl_new, struct iscsi_node_acl,
-                                se_node_acl);
-
         cmdsn_depth = ISCSI_TPG_ATTRIB(tpg)->default_cmdsn_depth;
         /*
          * se_nacl_new may be released by core_tpg_add_initiator_node_acl()
@@ -825,7 +822,8 @@ static struct se_node_acl *lio_target_make_nodeacl(
         if (IS_ERR(se_nacl))
                 return se_nacl;
 
-        stats_cg = &acl->se_node_acl.acl_fabric_stat_group;
+        acl = container_of(se_nacl, struct iscsi_node_acl, se_node_acl);
+        stats_cg = &se_nacl->acl_fabric_stat_group;
 
         stats_cg->default_groups = kzalloc(sizeof(struct config_group) * 2,
                                 GFP_KERNEL);
@@ -1505,28 +1503,6 @@ static int iscsi_get_cmd_state(struct se_cmd *se_cmd)
         return cmd->i_state;
 }
 
-static int iscsi_is_state_remove(struct se_cmd *se_cmd)
-{
-        struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd);
-
-        return (cmd->i_state == ISTATE_REMOVE);
-}
-
-static int lio_sess_logged_in(struct se_session *se_sess)
-{
-        struct iscsi_session *sess = se_sess->fabric_sess_ptr;
-        int ret;
-        /*
-         * Called with spin_lock_bh(&tpg_lock); and
-         * spin_lock(&se_tpg->session_lock); held.
-         */
-        spin_lock(&sess->conn_lock);
-        ret = (sess->session_state != TARG_SESS_STATE_LOGGED_IN);
-        spin_unlock(&sess->conn_lock);
-
-        return ret;
-}
-
 static u32 lio_sess_get_index(struct se_session *se_sess)
 {
         struct iscsi_session *sess = se_sess->fabric_sess_ptr;
@@ -1700,8 +1676,8 @@ static int lio_tpg_shutdown_session(struct se_session *se_sess)
         atomic_set(&sess->session_reinstatement, 1);
         spin_unlock(&sess->conn_lock);
 
-        iscsit_inc_session_usage_count(sess);
         iscsit_stop_time2retain_timer(sess);
+        iscsit_stop_session(sess, 1, 1);
 
         return 1;
 }
@@ -1717,28 +1693,9 @@ static void lio_tpg_close_session(struct se_session *se_sess)
          * If the iSCSI Session for the iSCSI Initiator Node exists,
          * forcefully shutdown the iSCSI NEXUS.
          */
-        iscsit_stop_session(sess, 1, 1);
-        iscsit_dec_session_usage_count(sess);
         iscsit_close_session(sess);
 }
 
-static void lio_tpg_stop_session(
-        struct se_session *se_sess,
-        int sess_sleep,
-        int conn_sleep)
-{
-        struct iscsi_session *sess = se_sess->fabric_sess_ptr;
-
-        iscsit_stop_session(sess, sess_sleep, conn_sleep);
-}
-
-static void lio_tpg_fall_back_to_erl0(struct se_session *se_sess)
-{
-        struct iscsi_session *sess = se_sess->fabric_sess_ptr;
-
-        iscsit_fall_back_to_erl0(sess);
-}
-
 static u32 lio_tpg_get_inst_index(struct se_portal_group *se_tpg)
 {
         struct iscsi_portal_group *tpg = se_tpg->se_tpg_fabric_ptr;
@@ -1802,9 +1759,6 @@ int iscsi_target_register_configfs(void)
         fabric->tf_ops.release_cmd = &lio_release_cmd;
         fabric->tf_ops.shutdown_session = &lio_tpg_shutdown_session;
         fabric->tf_ops.close_session = &lio_tpg_close_session;
-        fabric->tf_ops.stop_session = &lio_tpg_stop_session;
-        fabric->tf_ops.fall_back_to_erl0 = &lio_tpg_fall_back_to_erl0;
-        fabric->tf_ops.sess_logged_in = &lio_sess_logged_in;
         fabric->tf_ops.sess_get_index = &lio_sess_get_index;
         fabric->tf_ops.sess_get_initiator_sid = &lio_sess_get_initiator_sid;
         fabric->tf_ops.write_pending = &lio_write_pending;
@@ -1818,7 +1772,6 @@ int iscsi_target_register_configfs(void)
         fabric->tf_ops.queue_tm_rsp = &lio_queue_tm_rsp;
         fabric->tf_ops.set_fabric_sense_len = &lio_set_fabric_sense_len;
         fabric->tf_ops.get_fabric_sense_len = &lio_get_fabric_sense_len;
-        fabric->tf_ops.is_state_remove = &iscsi_is_state_remove;
         /*
          * Setup function pointers for generic logic in target_core_fabric_configfs.c
          */
diff --git a/drivers/target/iscsi/iscsi_target_core.h b/drivers/target/iscsi/iscsi_target_core.h
index 0ec3b77a0c27..2aaee7efa683 100644
--- a/drivers/target/iscsi/iscsi_target_core.h
+++ b/drivers/target/iscsi/iscsi_target_core.h
@@ -9,7 +9,7 @@
 #include <scsi/iscsi_proto.h>
 #include <target/target_core_base.h>
 
-#define ISCSIT_VERSION                  "v4.1.0-rc1"
+#define ISCSIT_VERSION                  "v4.1.0-rc2"
 #define ISCSI_MAX_DATASN_MISSING_COUNT  16
 #define ISCSI_TX_THREAD_TCP_TIMEOUT     2
 #define ISCSI_RX_THREAD_TCP_TIMEOUT     2
diff --git a/drivers/target/iscsi/iscsi_target_device.c b/drivers/target/iscsi/iscsi_target_device.c
index f63ea35bc4ae..bcc409853a67 100644
--- a/drivers/target/iscsi/iscsi_target_device.c
+++ b/drivers/target/iscsi/iscsi_target_device.c
@@ -28,25 +28,6 @@
 #include "iscsi_target_tpg.h"
 #include "iscsi_target_util.h"
 
-int iscsit_get_lun_for_tmr(
-        struct iscsi_cmd *cmd,
-        u64 lun)
-{
-        u32 unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);
-
-        return transport_lookup_tmr_lun(&cmd->se_cmd, unpacked_lun);
-}
-
-int iscsit_get_lun_for_cmd(
-        struct iscsi_cmd *cmd,
-        unsigned char *cdb,
-        u64 lun)
-{
-        u32 unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);
-
-        return transport_lookup_cmd_lun(&cmd->se_cmd, unpacked_lun);
-}
-
 void iscsit_determine_maxcmdsn(struct iscsi_session *sess)
 {
         struct se_node_acl *se_nacl;
diff --git a/drivers/target/iscsi/iscsi_target_device.h b/drivers/target/iscsi/iscsi_target_device.h
index bef1cada15f8..a0e2df9e8090 100644
--- a/drivers/target/iscsi/iscsi_target_device.h
+++ b/drivers/target/iscsi/iscsi_target_device.h
@@ -1,8 +1,6 @@
 #ifndef ISCSI_TARGET_DEVICE_H
 #define ISCSI_TARGET_DEVICE_H
 
-extern int iscsit_get_lun_for_tmr(struct iscsi_cmd *, u64);
-extern int iscsit_get_lun_for_cmd(struct iscsi_cmd *, unsigned char *, u64);
 extern void iscsit_determine_maxcmdsn(struct iscsi_session *);
 extern void iscsit_increment_maxcmdsn(struct iscsi_cmd *, struct iscsi_session *);
 
diff --git a/drivers/target/iscsi/iscsi_target_erl0.c b/drivers/target/iscsi/iscsi_target_erl0.c
index 478451167b62..1ab0560b0924 100644
--- a/drivers/target/iscsi/iscsi_target_erl0.c
+++ b/drivers/target/iscsi/iscsi_target_erl0.c
@@ -783,7 +783,7 @@ static void iscsit_handle_time2retain_timeout(unsigned long data)
         }
 
         spin_unlock_bh(&se_tpg->session_lock);
-        iscsit_close_session(sess);
+        target_put_session(sess->se_sess);
 }
 
 extern void iscsit_start_time2retain_handler(struct iscsi_session *sess)
diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c
index 27901e37c125..006f605edb08 100644
--- a/drivers/target/iscsi/iscsi_target_erl1.c
+++ b/drivers/target/iscsi/iscsi_target_erl1.c
@@ -416,7 +416,7 @@ static int iscsit_handle_recovery_datain(
         struct iscsi_datain_req *dr;
         struct se_cmd *se_cmd = &cmd->se_cmd;
 
-        if (!atomic_read(&se_cmd->t_transport_complete)) {
+        if (!(se_cmd->transport_state & CMD_T_COMPLETE)) {
                 pr_err("Ignoring ITT: 0x%08x Data SNACK\n",
                                 cmd->init_task_tag);
                 return 0;
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index 1ee33a8c3fab..a3656c9903a1 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -181,14 +181,16 @@ int iscsi_check_for_session_reinstatement(struct iscsi_conn *conn)
         if (sess->session_state == TARG_SESS_STATE_FAILED) {
                 spin_unlock_bh(&sess->conn_lock);
                 iscsit_dec_session_usage_count(sess);
-                return iscsit_close_session(sess);
+                target_put_session(sess->se_sess);
+                return 0;
         }
         spin_unlock_bh(&sess->conn_lock);
 
         iscsit_stop_session(sess, 1, 1);
         iscsit_dec_session_usage_count(sess);
 
-        return iscsit_close_session(sess);
+        target_put_session(sess->se_sess);
+        return 0;
 }
 
 static void iscsi_login_set_conn_values(
@@ -881,7 +883,7 @@ fail:
 static int __iscsi_target_login_thread(struct iscsi_np *np)
 {
         u8 buffer[ISCSI_HDR_LEN], iscsi_opcode, zero_tsih = 0;
-        int err, ret = 0, ip_proto, sock_type, set_sctp_conn_flag, stop;
+        int err, ret = 0, set_sctp_conn_flag, stop;
         struct iscsi_conn *conn = NULL;
         struct iscsi_login *login;
         struct iscsi_portal_group *tpg = NULL;
@@ -894,8 +896,6 @@ static int __iscsi_target_login_thread(struct iscsi_np *np)
         flush_signals(current);
         set_sctp_conn_flag = 0;
         sock = np->np_socket;
-        ip_proto = np->np_ip_proto;
-        sock_type = np->np_sock_type;
 
         spin_lock_bh(&np->np_thread_lock);
         if (np->np_thread_state == ISCSI_NP_THREAD_RESET) {
diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c
index e89fa7457254..2dba448cac19 100644
--- a/drivers/target/iscsi/iscsi_target_nego.c
+++ b/drivers/target/iscsi/iscsi_target_nego.c
@@ -90,7 +90,7 @@ int extract_param(
                 return -1;
 
         if (len > max_length) {
-                pr_err("Length of input: %d exeeds max_length:"
+                pr_err("Length of input: %d exceeds max_length:"
                         " %d\n", len, max_length);
                 return -1;
         }
@@ -173,13 +173,11 @@ static int iscsi_target_check_login_request(
         struct iscsi_conn *conn,
         struct iscsi_login *login)
 {
-        int req_csg, req_nsg, rsp_csg, rsp_nsg;
+        int req_csg, req_nsg;
         u32 payload_length;
         struct iscsi_login_req *login_req;
-        struct iscsi_login_rsp *login_rsp;
 
         login_req = (struct iscsi_login_req *) login->req;
-        login_rsp = (struct iscsi_login_rsp *) login->rsp;
         payload_length = ntoh24(login_req->dlength);
 
         switch (login_req->opcode & ISCSI_OPCODE_MASK) {
@@ -203,9 +201,7 @@ static int iscsi_target_check_login_request(
         }
 
         req_csg = (login_req->flags & ISCSI_FLAG_LOGIN_CURRENT_STAGE_MASK) >> 2;
-        rsp_csg = (login_rsp->flags & ISCSI_FLAG_LOGIN_CURRENT_STAGE_MASK) >> 2;
         req_nsg = (login_req->flags & ISCSI_FLAG_LOGIN_NEXT_STAGE_MASK);
-        rsp_nsg = (login_rsp->flags & ISCSI_FLAG_LOGIN_NEXT_STAGE_MASK);
 
         if (req_csg != login->current_stage) {
                 pr_err("Initiator unexpectedly changed login stage"
@@ -753,12 +749,10 @@ static int iscsi_target_locate_portal(
         struct iscsi_session *sess = conn->sess;
         struct iscsi_tiqn *tiqn;
         struct iscsi_login_req *login_req;
-        struct iscsi_targ_login_rsp *login_rsp;
         u32 payload_length;
         int sessiontype = 0, ret = 0;
 
         login_req = (struct iscsi_login_req *) login->req;
-        login_rsp = (struct iscsi_targ_login_rsp *) login->rsp;
         payload_length = ntoh24(login_req->dlength);
 
         login->first_request    = 1;
diff --git a/drivers/target/iscsi/iscsi_target_nodeattrib.c b/drivers/target/iscsi/iscsi_target_nodeattrib.c
index b3c699c4fe8c..11dc2936af76 100644
--- a/drivers/target/iscsi/iscsi_target_nodeattrib.c
+++ b/drivers/target/iscsi/iscsi_target_nodeattrib.c
@@ -49,7 +49,7 @@ void iscsit_set_default_node_attribues(
         a->default_erl = NA_DEFAULT_ERL;
 }
 
-extern int iscsit_na_dataout_timeout(
+int iscsit_na_dataout_timeout(
         struct iscsi_node_acl *acl,
         u32 dataout_timeout)
 {
@@ -74,7 +74,7 @@ extern int iscsit_na_dataout_timeout(
         return 0;
 }
 
-extern int iscsit_na_dataout_timeout_retries(
+int iscsit_na_dataout_timeout_retries(
         struct iscsi_node_acl *acl,
         u32 dataout_timeout_retries)
 {
@@ -100,7 +100,7 @@ extern int iscsit_na_dataout_timeout_retries(
         return 0;
 }
 
-extern int iscsit_na_nopin_timeout(
+int iscsit_na_nopin_timeout(
         struct iscsi_node_acl *acl,
         u32 nopin_timeout)
 {
@@ -155,7 +155,7 @@ extern int iscsit_na_nopin_timeout(
         return 0;
 }
 
-extern int iscsit_na_nopin_response_timeout(
+int iscsit_na_nopin_response_timeout(
         struct iscsi_node_acl *acl,
         u32 nopin_response_timeout)
 {
@@ -181,7 +181,7 @@ extern int iscsit_na_nopin_response_timeout(
         return 0;
 }
 
-extern int iscsit_na_random_datain_pdu_offsets(
+int iscsit_na_random_datain_pdu_offsets(
         struct iscsi_node_acl *acl,
         u32 random_datain_pdu_offsets)
 {
@@ -201,7 +201,7 @@ extern int iscsit_na_random_datain_pdu_offsets(
         return 0;
 }
 
-extern int iscsit_na_random_datain_seq_offsets(
+int iscsit_na_random_datain_seq_offsets(
         struct iscsi_node_acl *acl,
         u32 random_datain_seq_offsets)
 {
@@ -221,7 +221,7 @@ extern int iscsit_na_random_datain_seq_offsets(
         return 0;
 }
 
-extern int iscsit_na_random_r2t_offsets(
+int iscsit_na_random_r2t_offsets(
         struct iscsi_node_acl *acl,
         u32 random_r2t_offsets)
 {
@@ -241,7 +241,7 @@ extern int iscsit_na_random_r2t_offsets(
         return 0;
 }
 
-extern int iscsit_na_default_erl(
+int iscsit_na_default_erl(
         struct iscsi_node_acl *acl,
         u32 default_erl)
 {
diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c
index 5b773160200f..eb05c9d751ea 100644
--- a/drivers/target/iscsi/iscsi_target_parameters.c
+++ b/drivers/target/iscsi/iscsi_target_parameters.c
@@ -874,8 +874,8 @@ static int iscsi_check_numerical_value(struct iscsi_param *param, char *value_pt
 static int iscsi_check_numerical_range_value(struct iscsi_param *param, char *value)
 {
         char *left_val_ptr = NULL, *right_val_ptr = NULL;
-        char *tilde_ptr = NULL, *tmp_ptr = NULL;
-        u32 left_val, right_val, local_left_val, local_right_val;
+        char *tilde_ptr = NULL;
+        u32 left_val, right_val, local_left_val;
 
         if (strcmp(param->name, IFMARKINT) &&
             strcmp(param->name, OFMARKINT)) {
@@ -903,8 +903,8 @@ static int iscsi_check_numerical_range_value(struct iscsi_param *param, char *va
         if (iscsi_check_numerical_value(param, right_val_ptr) < 0)
                 return -1;
 
-        left_val = simple_strtoul(left_val_ptr, &tmp_ptr, 0);
-        right_val = simple_strtoul(right_val_ptr, &tmp_ptr, 0);
+        left_val = simple_strtoul(left_val_ptr, NULL, 0);
+        right_val = simple_strtoul(right_val_ptr, NULL, 0);
         *tilde_ptr = '~';
 
         if (right_val < left_val) {
@@ -928,8 +928,7 @@ static int iscsi_check_numerical_range_value(struct iscsi_param *param, char *va
         left_val_ptr = param->value;
         right_val_ptr = param->value + strlen(left_val_ptr) + 1;
 
-        local_left_val = simple_strtoul(left_val_ptr, &tmp_ptr, 0);
-        local_right_val = simple_strtoul(right_val_ptr, &tmp_ptr, 0);
+        local_left_val = simple_strtoul(left_val_ptr, NULL, 0);
         *tilde_ptr = '~';
 
         if (param->set_param) {
@@ -1189,7 +1188,7 @@ static int iscsi_check_proposer_state(struct iscsi_param *param, char *value)
         if (IS_TYPE_NUMBER_RANGE(param)) {
                 u32 left_val = 0, right_val = 0, recieved_value = 0;
                 char *left_val_ptr = NULL, *right_val_ptr = NULL;
-                char *tilde_ptr = NULL, *tmp_ptr = NULL;
+                char *tilde_ptr = NULL;
 
                 if (!strcmp(value, IRRELEVANT) || !strcmp(value, REJECT)) {
                         if (iscsi_update_param_value(param, value) < 0)
@@ -1213,9 +1212,9 @@ static int iscsi_check_proposer_state(struct iscsi_param *param, char *value)
 
                 left_val_ptr = param->value;
                 right_val_ptr = param->value + strlen(left_val_ptr) + 1;
-                left_val = simple_strtoul(left_val_ptr, &tmp_ptr, 0);
-                right_val = simple_strtoul(right_val_ptr, &tmp_ptr, 0);
-                recieved_value = simple_strtoul(value, &tmp_ptr, 0);
+                left_val = simple_strtoul(left_val_ptr, NULL, 0);
+                right_val = simple_strtoul(right_val_ptr, NULL, 0);
+                recieved_value = simple_strtoul(value, NULL, 0);
 
                 *tilde_ptr = '~';
 
diff --git a/drivers/target/iscsi/iscsi_target_tmr.c b/drivers/target/iscsi/iscsi_target_tmr.c
index 255ed35da815..e01da9d2b37e 100644
--- a/drivers/target/iscsi/iscsi_target_tmr.c
+++ b/drivers/target/iscsi/iscsi_target_tmr.c
@@ -250,7 +250,7 @@ static int iscsit_task_reassign_complete_write(
          * so if we have received all DataOUT we can safety ignore Initiator.
          */
         if (cmd->cmd_flags & ICF_GOT_LAST_DATAOUT) {
-                if (!atomic_read(&cmd->se_cmd.t_transport_sent)) {
+                if (!(cmd->se_cmd.transport_state & CMD_T_SENT)) {
                         pr_debug("WRITE ITT: 0x%08x: t_state: %d"
                                 " never sent to transport\n",
                                 cmd->init_task_tag, cmd->se_cmd.t_state);
@@ -314,7 +314,7 @@ static int iscsit_task_reassign_complete_read(
                 cmd->acked_data_sn = (tmr_req->exp_data_sn - 1);
         }
 
-        if (!atomic_read(&cmd->se_cmd.t_transport_sent)) {
+        if (!(cmd->se_cmd.transport_state & CMD_T_SENT)) {
                 pr_debug("READ ITT: 0x%08x: t_state: %d never sent to"
                         " transport\n", cmd->init_task_tag,
                         cmd->se_cmd.t_state);
@@ -322,7 +322,7 @@ static int iscsit_task_reassign_complete_read(
                 return 0;
         }
 
-        if (!atomic_read(&se_cmd->t_transport_complete)) {
+        if (!(se_cmd->transport_state & CMD_T_COMPLETE)) {
                 pr_err("READ ITT: 0x%08x: t_state: %d, never returned"
                         " from transport\n", cmd->init_task_tag,
                         cmd->se_cmd.t_state);
diff --git a/drivers/target/iscsi/iscsi_target_tq.c b/drivers/target/iscsi/iscsi_target_tq.c
index 0baac5bcebd4..977e1cf90e83 100644
--- a/drivers/target/iscsi/iscsi_target_tq.c
+++ b/drivers/target/iscsi/iscsi_target_tq.c
@@ -536,12 +536,6 @@ int iscsi_thread_set_init(void)
                 return -ENOMEM;
         }
 
-        spin_lock_init(&active_ts_lock);
-        spin_lock_init(&inactive_ts_lock);
-        spin_lock_init(&ts_bitmap_lock);
-        INIT_LIST_HEAD(&active_ts_list);
-        INIT_LIST_HEAD(&inactive_ts_list);
-
         return 0;
 }
 
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
index 11287e1ece13..4eba86d2bd82 100644
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@ -229,6 +229,7 @@ struct iscsi_cmd *iscsit_allocate_se_cmd_for_tmr(
 {
         struct iscsi_cmd *cmd;
         struct se_cmd *se_cmd;
+        int rc;
         u8 tcm_function;
 
         cmd = iscsit_allocate_cmd(conn, GFP_KERNEL);
@@ -286,10 +287,8 @@ struct iscsi_cmd *iscsit_allocate_se_cmd_for_tmr(
                 goto out;
         }
 
-        se_cmd->se_tmr_req = core_tmr_alloc_req(se_cmd,
-                                cmd->tmr_req, tcm_function,
-                                GFP_KERNEL);
-        if (!se_cmd->se_tmr_req)
+        rc = core_tmr_alloc_req(se_cmd, cmd->tmr_req, tcm_function, GFP_KERNEL);
+        if (rc < 0)
                 goto out;
 
         cmd->tmr_req->se_tmr_req = se_cmd->se_tmr_req;