41 files changed, 1315 insertions, 2304 deletions

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index daf21b899999..5f6b7f63cdef 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -1099,9 +1099,8 @@ static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
         dir = cmd->data_direction;
         BUG_ON(dir == DMA_NONE);
 
-        transport_do_task_sg_chain(cmd);
-        ioctx->sg = sg = sg_orig = cmd->t_tasks_sg_chained;
-        ioctx->sg_cnt = sg_cnt = cmd->t_tasks_sg_chained_no;
+        ioctx->sg = sg = sg_orig = cmd->t_data_sg;
+        ioctx->sg_cnt = sg_cnt = cmd->t_data_nents;
 
         count = ib_dma_map_sg(ch->sport->sdev->device, sg, sg_cnt,
                               opposite_dma_dir(dir));
@@ -1769,7 +1768,7 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch,
                 kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref);
                 goto send_sense;
         }
-        ret = transport_generic_allocate_tasks(cmd, srp_cmd->cdb);
+        ret = target_setup_cmd_from_cdb(cmd, srp_cmd->cdb);
         if (ret < 0) {
                 kref_put(&send_ioctx->kref, srpt_put_send_ioctx_kref);
                 if (cmd->se_cmd_flags & SCF_SCSI_RESERVATION_CONFLICT) {
@@ -4004,9 +4003,6 @@ static int __init srpt_init_module(void)
 
         srpt_target->tf_ops = srpt_template;
 
-        /* Enable SG chaining */
-        srpt_target->tf_ops.task_sg_chaining = true;
-
         /*
          * Set up default attribute lists.
          */
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 8b1d5e62ed40..d57d10cb2e47 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -27,8 +27,10 @@
 #include <asm/unaligned.h>
 #include <scsi/scsi_device.h>
 #include <scsi/iscsi_proto.h>
+#include <scsi/scsi_tcq.h>
 #include <target/target_core_base.h>
 #include <target/target_core_fabric.h>
+#include <target/target_core_configfs.h>
 
 #include "iscsi_target_core.h"
 #include "iscsi_target_parameters.h"
@@ -593,7 +595,7 @@ static void __exit iscsi_target_cleanup_module(void)
         kfree(iscsit_global);
 }
 
-int iscsit_add_reject(
+static int iscsit_add_reject(
         u8 reason,
         int fail_conn,
         unsigned char *buf,
@@ -622,7 +624,7 @@ int iscsit_add_reject(
         }
 
         spin_lock_bh(&conn->cmd_lock);
-        list_add_tail(&cmd->i_list, &conn->conn_cmd_list);
+        list_add_tail(&cmd->i_conn_node, &conn->conn_cmd_list);
         spin_unlock_bh(&conn->cmd_lock);
 
         cmd->i_state = ISTATE_SEND_REJECT;
@@ -669,7 +671,7 @@ int iscsit_add_reject_from_cmd(
 
         if (add_to_conn) {
                 spin_lock_bh(&conn->cmd_lock);
-                list_add_tail(&cmd->i_list, &conn->conn_cmd_list);
+                list_add_tail(&cmd->i_conn_node, &conn->conn_cmd_list);
                 spin_unlock_bh(&conn->cmd_lock);
         }
 
@@ -685,9 +687,7 @@ int iscsit_add_reject_from_cmd(
 
 /*
  * Map some portion of the allocated scatterlist to an iovec, suitable for
- * kernel sockets to copy data in/out. This handles both pages and slab-allocated
- * buffers, since we have been tricky and mapped t_mem_sg to the buffer in
- * either case (see iscsit_alloc_buffs)
+ * kernel sockets to copy data in/out.
  */
 static int iscsit_map_iovec(
         struct iscsi_cmd *cmd,
@@ -700,10 +700,9 @@ static int iscsit_map_iovec(
         unsigned int page_off;
 
         /*
-         * We have a private mapping of the allocated pages in t_mem_sg.
-         * At this point, we also know each contains a page.
+         * We know each entry in t_data_sg contains a page.
          */
-        sg = &cmd->t_mem_sg[data_offset / PAGE_SIZE];
+        sg = &cmd->se_cmd.t_data_sg[data_offset / PAGE_SIZE];
         page_off = (data_offset % PAGE_SIZE);
 
         cmd->first_data_sg = sg;
@@ -744,7 +743,7 @@ static void iscsit_ack_from_expstatsn(struct iscsi_conn *conn, u32 exp_statsn)
         conn->exp_statsn = exp_statsn;
 
         spin_lock_bh(&conn->cmd_lock);
-        list_for_each_entry(cmd, &conn->conn_cmd_list, i_list) {
+        list_for_each_entry(cmd, &conn->conn_cmd_list, i_conn_node) {