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

Pull target updates from Nicholas Bellinger:
 "It has been a very busy development cycle this time around in target
  land, with the highlights including:

   - Kill struct se_subsystem_dev, in favor of direct se_device usage
     (hch)
   - Simplify reservations code by combining SPC-3 + SCSI-2 support for
     virtual backends only (hch)
   - Simplify ALUA code for virtual only backends, and remove left over
     abstractions (hch)
   - Pass sense_reason_t as return value for I/O submission path (hch)
   - Refactor MODE_SENSE emulation to allow for easier addition of new
     mode pages.  (roland)
   - Add emulation of MODE_SELECT (roland)
   - Fix bug in handling of ExpStatSN wrap-around (steve)
   - Fix bug in TMR ABORT_TASK lookup in qla2xxx target (steve)
   - Add WRITE_SAME w/ UNMAP=0 support for IBLOCK backends (nab)
   - Convert ib_srpt to use modern target_submit_cmd caller + drop
     legacy ioctx->kref usage (nab)
   - Convert ib_srpt to use modern target_submit_tmr caller (nab)
   - Add link_magic for fabric allow_link destination target_items for
     symlinks within target_core_fabric_configfs.c code (nab)
   - Allocate pointers in instead of full structs for
     config_group->default_groups (sebastian)
   - Fix 32-bit highmem breakage for FILEIO (sebastian)

  All told, hch was able to shave off another ~1K LOC by killing the
  se_subsystem_dev abstraction, along with a number of PR + ALUA
  simplifications.  Also, a nice patch by Roland is the refactoring of
  MODE_SENSE handling, along with the addition of initial MODE_SELECT
  emulation support for virtual backends.

  Sebastian found a long-standing issue wrt to allocation of full
  config_group instead of pointers for config_group->default_group[]
  setup in a number of areas, which ends up saving memory with big
  configurations.  He also managed to fix another long-standing BUG wrt
  to broken 32-bit highmem support within the FILEIO backend driver.

  Thank you again to everyone who contributed this round!"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (50 commits)
  target/iscsi_target: Add NodeACL tags for initiator group support
  target/tcm_fc: fix the lockdep warning due to inconsistent lock state
  sbp-target: fix error path in sbp_make_tpg()
  sbp-target: use simple assignment in tgt_agent_rw_agent_state()
  iscsi-target: use kstrdup() for iscsi_param
  target/file: merge fd_do_readv() and fd_do_writev()
  target/file: Fix 32-bit highmem breakage for SGL -> iovec mapping
  target: Add link_magic for fabric allow_link destination target_items
  ib_srpt: Convert TMR path to target_submit_tmr
  ib_srpt: Convert I/O path to target_submit_cmd + drop legacy ioctx->kref
  target: Make spc_get_write_same_sectors return sector_t
  target/configfs: use kmalloc() instead of kzalloc() for default groups
  target/configfs: allocate only 6 slots for dev_cg->default_groups
  target/configfs: allocate pointers instead of full struct for default_groups
  target: update error handling for sbc_setup_write_same()
  iscsit: use GFP_ATOMIC under spin lock
  iscsi_target: Remove redundant null check before kfree
  target/iblock: Forward declare bio helpers
  target: Clean up flow in transport_check_aborted_status()
  target: Clean up logic in transport_put_cmd()
  ...

11 files changed, 89 insertions, 97 deletions

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 035c2c762537..339f97f7085b 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -735,7 +735,7 @@ static void iscsit_ack_from_expstatsn(struct iscsi_conn *conn, u32 exp_statsn)
         list_for_each_entry(cmd, &conn->conn_cmd_list, i_conn_node) {
                 spin_lock(&cmd->istate_lock);
                 if ((cmd->i_state == ISTATE_SENT_STATUS) &&
-                    (cmd->stat_sn < exp_statsn)) {
+                    iscsi_sna_lt(cmd->stat_sn, exp_statsn)) {
                         cmd->i_state = ISTATE_REMOVE;
                         spin_unlock(&cmd->istate_lock);
                         iscsit_add_cmd_to_immediate_queue(cmd, conn,
@@ -767,9 +767,8 @@ static int iscsit_handle_scsi_cmd(
         struct iscsi_conn *conn,
         unsigned char *buf)
 {
-        int     data_direction, cmdsn_ret = 0, immed_ret, ret, transport_ret;
-        int     dump_immediate_data = 0, send_check_condition = 0, payload_length;
-        struct iscsi_cmd        *cmd = NULL;
+        int data_direction, payload_length, cmdsn_ret = 0, immed_ret;
+        struct iscsi_cmd *cmd = NULL;
         struct iscsi_scsi_req *hdr;
         int iscsi_task_attr;
         int sam_task_attr;
@@ -956,38 +955,26 @@ done:
                 " ExpXferLen: %u, Length: %u, CID: %hu\n", hdr->itt,
                 hdr->cmdsn, hdr->data_length, payload_length, conn->cid);
 
-        /*
-         * The CDB is going to an se_device_t.
-         */
-        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,"
-                                " non-existent or non-exported iSCSI LUN:"
-                                " 0x%016Lx\n", get_unaligned_le64(&hdr->lun));
+        cmd->sense_reason = transport_lookup_cmd_lun(&cmd->se_cmd,
+                                                     scsilun_to_int(&hdr->lun));
+        if (cmd->sense_reason)
+                goto attach_cmd;
+
+        cmd->sense_reason = target_setup_cmd_from_cdb(&cmd->se_cmd, hdr->cdb);
+        if (cmd->sense_reason) {
+                if (cmd->sense_reason == TCM_OUT_OF_RESOURCES) {
+                        return iscsit_add_reject_from_cmd(
+                                        ISCSI_REASON_BOOKMARK_NO_RESOURCES,
+                                        1, 1, buf, cmd);
                 }
-                send_check_condition = 1;
+
                 goto attach_cmd;
         }
 
-        transport_ret = target_setup_cmd_from_cdb(&cmd->se_cmd, hdr->cdb);
-        if (transport_ret == -ENOMEM) {
+        if (iscsit_build_pdu_and_seq_lists(cmd, payload_length) < 0) {
                 return iscsit_add_reject_from_cmd(
-                                ISCSI_REASON_BOOKMARK_NO_RESOURCES,
-                                1, 1, buf, cmd);
-        } else if (transport_ret < 0) {
-                /*
-                 * Unsupported SAM Opcode.  CHECK_CONDITION will be sent
-                 * in iscsit_execute_cmd() during the CmdSN OOO Execution
-                 * Mechinism.
-                 */
-                send_check_condition = 1;
-        } else {
-                if (iscsit_build_pdu_and_seq_lists(cmd, payload_length) < 0)
-                        return iscsit_add_reject_from_cmd(
-                                ISCSI_REASON_BOOKMARK_NO_RESOURCES,
-                                1, 1, buf, cmd);
+                        ISCSI_REASON_BOOKMARK_NO_RESOURCES,
+                        1, 1, buf, cmd);
         }
 
 attach_cmd:
@@ -1000,11 +987,12 @@ attach_cmd:
          */
         core_alua_check_nonop_delay(&cmd->se_cmd);
 
-        ret = iscsit_allocate_iovecs(cmd);
-        if (ret < 0)
+        if (iscsit_allocate_iovecs(cmd) < 0) {
                 return iscsit_add_reject_from_cmd(
                                 ISCSI_REASON_BOOKMARK_NO_RESOURCES,
                                 1, 0, buf, cmd);
+        }
+
         /*
          * Check the CmdSN against ExpCmdSN/MaxCmdSN here if
          * the Immediate Bit is not set, and no Immediate
@@ -1031,10 +1019,7 @@ attach_cmd:
          * If no Immediate Data is attached, it's OK to return now.
          */
         if (!cmd->immediate_data) {
-                if (send_check_condition)
-                        return 0;
-
-                if (cmd->unsolicited_data) {
+                if (!cmd->sense_reason && cmd->unsolicited_data) {
                         iscsit_set_dataout_sequence_values(cmd);
 
                         spin_lock_bh(&cmd->dataout_timeout_lock);
@@ -1050,19 +1035,17 @@ attach_cmd:
          * thread.  They are processed in CmdSN order by
          * iscsit_check_received_cmdsn() below.
          */
-        if (send_check_condition) {
+        if (cmd->sense_reason) {
                 immed_ret = IMMEDIATE_DATA_NORMAL_OPERATION;
-                dump_immediate_data = 1;
                 goto after_immediate_data;
         }
         /*
          * Call directly into transport_generic_new_cmd() to perform
          * the backend memory allocation.
          */
-        ret = transport_generic_new_cmd(&cmd->se_cmd);
-        if (ret < 0) {
+        cmd->sense_reason = transport_generic_new_cmd(&cmd->se_cmd);
+        if (cmd->sense_reason) {
                 immed_ret = IMMEDIATE_DATA_NORMAL_OPERATION;
-                dump_immediate_data = 1;
                 goto after_immediate_data;
         }
 
@@ -1079,7 +1062,7 @@ after_immediate_data:
                  * Special case for Unsupported SAM WRITE Opcodes
                  * and ImmediateData=Yes.
                  */
-                if (dump_immediate_data) {
+                if (cmd->sense_reason) {
                         if (iscsit_dump_data_payload(conn, payload_length, 1) < 0)
                                 return -1;
                 } else if (cmd->unsolicited_data) {
@@ -1272,8 +1255,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf)
                 spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
 
                 spin_lock_irqsave(&se_cmd->t_state_lock, flags);
-                if (!(se_cmd->se_cmd_flags & SCF_SUPPORTED_SAM_OPCODE) ||
-                     (se_cmd->se_cmd_flags & SCF_SCSI_CDB_EXCEPTION))
+                if (!(se_cmd->se_cmd_flags & SCF_SUPPORTED_SAM_OPCODE))
                         dump_unsolicited_data = 1;
                 spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
 
@@ -1742,7 +1724,6 @@ static int iscsit_handle_task_mgt_cmd(
                 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;
                         goto attach;
                 }
@@ -1751,10 +1732,8 @@ static int iscsit_handle_task_mgt_cmd(
         switch (function) {
         case ISCSI_TM_FUNC_ABORT_TASK:
                 se_tmr->response = iscsit_tmr_abort_task(cmd, buf);
-                if (se_tmr->response != ISCSI_TMF_RSP_COMPLETE) {
-                        cmd->se_cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
+                if (se_tmr->response)
                         goto attach;
-                }
                 break;
         case ISCSI_TM_FUNC_ABORT_TASK_SET:
         case ISCSI_TM_FUNC_CLEAR_ACA:
@@ -1763,14 +1742,12 @@ static int iscsit_handle_task_mgt_cmd(
                 break;
         case ISCSI_TM_FUNC_TARGET_WARM_RESET:
                 if (iscsit_tmr_task_warm_reset(conn, tmr_req, buf) < 0) {
-                        cmd->se_cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
                         se_tmr->response = ISCSI_TMF_RSP_AUTH_FAILED;
                         goto attach;
                 }
                 break;
         case ISCSI_TM_FUNC_TARGET_COLD_RESET:
                 if (iscsit_tmr_task_cold_reset(conn, tmr_req, buf) < 0) {
-                        cmd->se_cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
                         se_tmr->response = ISCSI_TMF_RSP_AUTH_FAILED;
                         goto attach;
                 }
@@ -1781,7 +1758,7 @@ static int iscsit_handle_task_mgt_cmd(
                  * Perform sanity checks on the ExpDataSN only if the
                  * TASK_REASSIGN was successful.
                  */
-                if (se_tmr->response != ISCSI_TMF_RSP_COMPLETE)
+                if (se_tmr->response)
                         break;
 
                 if (iscsit_check_task_reassign_expdatasn(tmr_req, conn) < 0)
@@ -1792,7 +1769,6 @@ static int iscsit_handle_task_mgt_cmd(
         default:
                 pr_err("Unknown TMR function: 0x%02x, protocol"
                         " error.\n", function);
-                cmd->se_cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
                 se_tmr->response = ISCSI_TMF_RSP_NOT_SUPPORTED;
                 goto attach;
         }
@@ -2360,7 +2336,7 @@ static void iscsit_build_conn_drop_async_message(struct iscsi_conn *conn)
         if (!conn_p)
                 return;
 
-        cmd = iscsit_allocate_cmd(conn_p, GFP_KERNEL);
+        cmd = iscsit_allocate_cmd(conn_p, GFP_ATOMIC);
         if (!cmd) {
                 iscsit_dec_conn_usage_count(conn_p);
                 return;
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index 0f03b7919d7c..78d75c8567d0 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -754,9 +754,33 @@ static ssize_t lio_target_nacl_store_cmdsn_depth(
 
 TF_NACL_BASE_ATTR(lio_target, cmdsn_depth, S_IRUGO | S_IWUSR);
 
+static ssize_t lio_target_nacl_show_tag(
+        struct se_node_acl *se_nacl,
+        char *page)
+{
+        return snprintf(page, PAGE_SIZE, "%s", se_nacl->acl_tag);
+}
+
+static ssize_t lio_target_nacl_store_tag(
+        struct se_node_acl *se_nacl,
+        const char *page,
+        size_t count)
+{
+        int ret;
+
+        ret = core_tpg_set_initiator_node_tag(se_nacl->se_tpg, se_nacl, page);
+
+        if (ret < 0)
+                return ret;
+        return count;
+}
+
+TF_NACL_BASE_ATTR(lio_target, tag, S_IRUGO | S_IWUSR);
+
 static struct configfs_attribute *lio_target_initiator_attrs[] = {
         &lio_target_nacl_info.attr,
         &lio_target_nacl_cmdsn_depth.attr,
+        &lio_target_nacl_tag.attr,
         NULL,
 };
 
@@ -803,7 +827,7 @@ static struct se_node_acl *lio_target_make_nodeacl(
         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,
+        stats_cg->default_groups = kmalloc(sizeof(struct config_group *) * 2,
                                 GFP_KERNEL);
         if (!stats_cg->default_groups) {
                 pr_err("Unable to allocate memory for"
@@ -1268,7 +1292,7 @@ static struct se_wwn *lio_target_call_coreaddtiqn(
          */
         stats_cg = &tiqn->tiqn_wwn.fabric_stat_group;
 
-        stats_cg->default_groups = kzalloc(sizeof(struct config_group) * 6,
+        stats_cg->default_groups = kmalloc(sizeof(struct config_group *) * 6,
                                 GFP_KERNEL);
         if (!stats_cg->default_groups) {
                 pr_err("Unable to allocate memory for"
diff --git a/drivers/target/iscsi/iscsi_target_core.h b/drivers/target/iscsi/iscsi_target_core.h
index 21048dbf7d13..7a333d28d9a2 100644
--- a/drivers/target/iscsi/iscsi_target_core.h
+++ b/drivers/target/iscsi/iscsi_target_core.h
@@ -474,7 +474,7 @@ struct iscsi_cmd {
         struct scatterlist      *first_data_sg;
         u32                     first_data_sg_off;
         u32                     kmapped_nents;
-
+        sense_reason_t          sense_reason;
 }  ____cacheline_aligned;
 
 struct iscsi_tmr_req {
diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c
index 21f29d91a8cb..0b52a2371305 100644
--- a/drivers/target/iscsi/iscsi_target_erl1.c
+++ b/drivers/target/iscsi/iscsi_target_erl1.c
@@ -929,11 +929,10 @@ int iscsit_execute_cmd(struct iscsi_cmd *cmd, int ooo)
         case ISCSI_OP_SCSI_CMD:
                 /*
                  * Go ahead and send the CHECK_CONDITION status for
-                 * any SCSI CDB exceptions that may have occurred, also
-                 * handle the SCF_SCSI_RESERVATION_CONFLICT case here as well.
+                 * any SCSI CDB exceptions that may have occurred.
                  */
-                if (se_cmd->se_cmd_flags & SCF_SCSI_CDB_EXCEPTION) {
-                        if (se_cmd->scsi_sense_reason == TCM_RESERVATION_CONFLICT) {
+                if (cmd->sense_reason) {
+                        if (cmd->sense_reason == TCM_RESERVATION_CONFLICT) {
                                 cmd->i_state = ISTATE_SEND_STATUS;
                                 spin_unlock_bh(&cmd->istate_lock);
                                 iscsit_add_cmd_to_response_queue(cmd, cmd->conn,
@@ -956,7 +955,7 @@ int iscsit_execute_cmd(struct iscsi_cmd *cmd, int ooo)
                          * exception
                          */
                         return transport_send_check_condition_and_sense(se_cmd,
-                                        se_cmd->scsi_sense_reason, 0);
+                                        cmd->sense_reason, 0);
                 }
                 /*
                  * Special case for delayed CmdSN with Immediate
@@ -1013,7 +1012,7 @@ int iscsit_execute_cmd(struct iscsi_cmd *cmd, int ooo)
                 iscsit_add_cmd_to_response_queue(cmd, cmd->conn, cmd->i_state);
                 break;
         case ISCSI_OP_SCSI_TMFUNC:
-                if (se_cmd->se_cmd_flags & SCF_SCSI_CDB_EXCEPTION) {
+                if (cmd->se_cmd.se_tmr_req->response) {
                         spin_unlock_bh(&cmd->istate_lock);
                         iscsit_add_cmd_to_response_queue(cmd, cmd->conn,
                                         cmd->i_state);
diff --git a/drivers/target/iscsi/iscsi_target_erl2.c b/drivers/target/iscsi/iscsi_target_erl2.c
index 17d8c20094fd..9ac4c151eae4 100644
--- a/drivers/target/iscsi/iscsi_target_erl2.c
+++ b/drivers/target/iscsi/iscsi_target_erl2.c
@@ -372,7 +372,7 @@ int iscsit_prepare_cmds_for_realligance(struct iscsi_conn *conn)
                  * made generic here.
                  */
                 if (!(cmd->cmd_flags & ICF_OOO_CMDSN) && !cmd->immediate_cmd &&
-                     (cmd->cmd_sn >= conn->sess->exp_cmd_sn)) {
+                     iscsi_sna_gte(cmd->stat_sn, conn->sess->exp_cmd_sn)) {
                         list_del(&cmd->i_conn_node);
                         spin_unlock_bh(&conn->cmd_lock);
                         iscsit_free_cmd(cmd);
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index f8dbec05d5e5..fdb632f0ab85 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -127,13 +127,13 @@ int iscsi_check_for_session_reinstatement(struct iscsi_conn *conn)
 
         initiatorname_param = iscsi_find_param_from_key(
                         INITIATORNAME, conn->param_list);
-        if (!initiatorname_param)
-                return -1;
-
         sessiontype_param = iscsi_find_param_from_key(
                         SESSIONTYPE, conn->param_list);
-        if (!sessiontype_param)
+        if (!initiatorname_param || !sessiontype_param) {
+                iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_INITIATOR_ERR,
+                        ISCSI_LOGIN_STATUS_MISSING_FIELDS);
                 return -1;
+        }
 
         sessiontype = (strncmp(sessiontype_param->value, NORMAL, 6)) ? 1 : 0;
 
@@ -254,9 +254,9 @@ static int iscsi_login_zero_tsih_s1(
                 kfree(sess);
                 return -ENOMEM;
         }
-        spin_lock(&sess_idr_lock);
+        spin_lock_bh(&sess_idr_lock);
         ret = idr_get_new(&sess_idr, NULL, &sess->session_index);
-        spin_unlock(&sess_idr_lock);
+        spin_unlock_bh(&sess_idr_lock);
 
         if (ret < 0) {
                 pr_err("idr_get_new() for sess_idr failed\n");
@@ -1118,10 +1118,8 @@ new_sess_out:
                 idr_remove(&sess_idr, conn->sess->session_index);
                 spin_unlock_bh(&sess_idr_lock);
         }
-        if (conn->sess->sess_ops)
-                kfree(conn->sess->sess_ops);
-        if (conn->sess)
-                kfree(conn->sess);
+        kfree(conn->sess->sess_ops);
+        kfree(conn->sess);
 old_sess_out:
         iscsi_stop_login_thread_timer(np);
         /*
diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c
index e9053a04f24c..9d902aefe01a 100644
--- a/drivers/target/iscsi/iscsi_target_nego.c
+++ b/drivers/target/iscsi/iscsi_target_nego.c
@@ -620,8 +620,11 @@ static int iscsi_target_handle_csg_one(struct iscsi_conn *conn, struct iscsi_log
                         login->req_buf,
                         payload_length,
                         conn);
-        if (ret < 0)
+        if (ret < 0) {
+                iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_INITIATOR_ERR,
+                                ISCSI_LOGIN_STATUS_INIT_ERR);
                 return -1;
+        }
 
         if (login->first_request)
                 if (iscsi_target_check_first_request(conn, login) < 0)
@@ -636,8 +639,11 @@ static int iscsi_target_handle_csg_one(struct iscsi_conn *conn, struct iscsi_log
                         login->rsp_buf,
                         &login->rsp_length,
                         conn->param_list);
-        if (ret < 0)
+        if (ret < 0) {
+                iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_INITIATOR_ERR,
+                                ISCSI_LOGIN_STATUS_INIT_ERR);
                 return -1;
+        }
 
         if (!login->auth_complete &&
              ISCSI_TPG_ATTRIB(ISCSI_TPG_C(conn))->authentication) {
diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c
index 1bf7432bfcbc..d89164287d00 100644
--- a/drivers/target/iscsi/iscsi_target_parameters.c
+++ b/drivers/target/iscsi/iscsi_target_parameters.c
@@ -154,22 +154,18 @@ static struct iscsi_param *iscsi_set_default_param(struct iscsi_param_list *para
         }
         INIT_LIST_HEAD(&param->p_list);
 
-        param->name = kzalloc(strlen(name) + 1, GFP_KERNEL);
+        param->name = kstrdup(name, GFP_KERNEL);
         if (!param->name) {
                 pr_err("Unable to allocate memory for parameter name.\n");
                 goto out;
         }
 
-        param->value = kzalloc(strlen(value) + 1, GFP_KERNEL);
+        param->value = kstrdup(value, GFP_KERNEL);
         if (!param->value) {
                 pr_err("Unable to allocate memory for parameter value.\n");
                 goto out;
         }
 
-        memcpy(param->name, name, strlen(name));
-        param->name[strlen(name)] = '\0';
-        memcpy(param->value, value, strlen(value));
-        param->value[strlen(value)] = '\0';
         param->phase            = phase;
         param->scope            = scope;
         param->sender           = sender;
@@ -635,11 +631,8 @@ void iscsi_release_param_list(struct iscsi_param_list *param_list)
                 list_del(&param->p_list);
 
                 kfree(param->name);
-                param->name = NULL;
                 kfree(param->value);
-                param->value = NULL;
                 kfree(param);
-                param = NULL;
         }
 
         iscsi_release_extra_responses(param_list);
@@ -687,15 +680,12 @@ int iscsi_update_param_value(struct iscsi_param *param, char *value)
 {
         kfree(param->value);
 
-        param->value = kzalloc(strlen(value) + 1, GFP_KERNEL);
+        param->value = kstrdup(value, GFP_KERNEL);
         if (!param->value) {
                 pr_err("Unable to allocate memory for value.\n");
                 return -ENOMEM;
         }
 
-        memcpy(param->value, value, strlen(value));
-        param->value[strlen(value)] = '\0';
-
         pr_debug("iSCSI Parameter updated to %s=%s\n",
                         param->name, param->value);
         return 0;
diff --git a/drivers/target/iscsi/iscsi_target_tmr.c b/drivers/target/iscsi/iscsi_target_tmr.c
index 4a99820d063b..9d4417aae921 100644
--- a/drivers/target/iscsi/iscsi_target_tmr.c
+++ b/drivers/target/iscsi/iscsi_target_tmr.c
@@ -50,8 +50,8 @@ u8 iscsit_tmr_abort_task(
         if (!ref_cmd) {
                 pr_err("Unable to locate RefTaskTag: 0x%08x on CID:"
                         " %hu.\n", hdr->rtt, conn->cid);
-                return (be32_to_cpu(hdr->refcmdsn) >= conn->sess->exp_cmd_sn &&
-                        be32_to_cpu(hdr->refcmdsn) <= conn->sess->max_cmd_sn) ?
+                return (iscsi_sna_gte(be32_to_cpu(hdr->refcmdsn), conn->sess->exp_cmd_sn) &&
+                        iscsi_sna_lte(be32_to_cpu(hdr->refcmdsn), conn->sess->max_cmd_sn)) ?
                         ISCSI_TMF_RSP_COMPLETE : ISCSI_TMF_RSP_NO_TASK;
         }
         if (ref_cmd->cmd_sn != be32_to_cpu(hdr->refcmdsn)) {
diff --git a/drivers/target/iscsi/iscsi_target_tq.c b/drivers/target/iscsi/iscsi_target_tq.c
index 9d881a000e42..81289520f96b 100644
--- a/drivers/target/iscsi/iscsi_target_tq.c
+++ b/drivers/target/iscsi/iscsi_target_tq.c
@@ -66,8 +66,7 @@ static struct iscsi_thread_set *iscsi_get_ts_from_inactive_list(void)
                 return NULL;
         }
 
-        list_for_each_entry(ts, &inactive_ts_list, ts_list)
-                break;
+        ts = list_first_entry(&inactive_ts_list, struct iscsi_thread_set, ts_list);
 
         list_del(&ts->ts_list);
         iscsit_global->inactive_ts--;
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
index 69e0cfd98870..7ce350578c82 100644
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@ -500,8 +500,8 @@ struct iscsi_queue_req *iscsit_get_cmd_from_immediate_queue(struct iscsi_conn *c
                 spin_unlock_bh(&conn->immed_queue_lock);
                 return NULL;
         }
-        list_for_each_entry(qr, &conn->immed_queue_list, qr_list)
-                break;
+        qr = list_first_entry(&conn->immed_queue_list,
+                              struct iscsi_queue_req, qr_list);
 
         list_del(&qr->qr_list);
         if (qr->cmd)
@@ -575,8 +575,8 @@ struct iscsi_queue_req *iscsit_get_cmd_from_response_queue(struct iscsi_conn *co
                 return NULL;
         }
 
-        list_for_each_entry(qr, &conn->response_queue_list, qr_list)
-                break;
+        qr = list_first_entry(&conn->response_queue_list,
+                              struct iscsi_queue_req, qr_list);
 
         list_del(&qr->qr_list);
         if (qr->cmd)