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

Pull SCSI target updates from Nicholas Bellinger:
 "Lots of activity in target land the last months.

  The highlights include:

   - Convert fabric drivers tree-wide to target_register_template() (hch
     + bart)

   - iser-target hardening fixes + v1.0 improvements (sagi)

   - Convert iscsi_thread_set usage to kthread.h + kill
     iscsi_target_tq.c (sagi + nab)

   - Add support for T10-PI WRITE_STRIP + READ_INSERT operation (mkp +
     sagi + nab)

   - DIF fixes for CONFIG_DEBUG_SG=y + UNMAP file emulation (akinobu +
     sagi + mkp)

   - Extended TCMU ABI v2 for future BIDI + DIF support (andy + ilias)

   - Fix COMPARE_AND_WRITE handling for NO_ALLLOC drivers (hch + nab)

  Thanks to everyone who contributed this round with new features,
  bug-reports, fixes, cleanups and improvements.

  Looking forward, it's currently shaping up to be a busy v4.2 as well"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (69 commits)
  target: Put TCMU under a new config option
  target: Version 2 of TCMU ABI
  target: fix tcm_mod_builder.py
  target/file: Fix UNMAP with DIF protection support
  target/file: Fix SG table for prot_buf initialization
  target/file: Fix BUG() when CONFIG_DEBUG_SG=y and DIF protection enabled
  target: Make core_tmr_abort_task() skip TMFs
  target/sbc: Update sbc_dif_generate pr_debug output
  target/sbc: Make internal DIF emulation honor ->prot_checks
  target/sbc: Return INVALID_CDB_FIELD if DIF + sess_prot_type disabled
  target: Ensure sess_prot_type is saved across session restart
  target/rd: Don't pass incomplete scatterlist entries to sbc_dif_verify_*
  target: Remove the unused flag SCF_ACK_KREF
  target: Fix two sparse warnings
  target: Fix COMPARE_AND_WRITE with SG_TO_MEM_NOALLOC handling
  target: simplify the target template registration API
  target: simplify target_xcopy_init_pt_lun
  target: remove the unused SCF_CMD_XCOPY_PASSTHROUGH flag
  target/rd: reduce code duplication in rd_execute_rw()
  tcm_loop: fixup tpgt string to integer conversion
  ...

12 files changed, 234 insertions, 795 deletions

diff --git a/drivers/target/iscsi/Makefile b/drivers/target/iscsi/Makefile
index 13a92403fe3e..0f43be9c3453 100644
--- a/drivers/target/iscsi/Makefile
+++ b/drivers/target/iscsi/Makefile
@@ -1,6 +1,5 @@
 iscsi_target_mod-y +=           iscsi_target_parameters.o \
                                 iscsi_target_seq_pdu_list.o \
-                                iscsi_target_tq.o \
                                 iscsi_target_auth.o \
                                 iscsi_target_datain_values.o \
                                 iscsi_target_device.o \
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 77d64251af40..34871a628b11 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -33,8 +33,6 @@
 #include <target/iscsi/iscsi_target_core.h>
 #include "iscsi_target_parameters.h"
 #include "iscsi_target_seq_pdu_list.h"
-#include "iscsi_target_tq.h"
-#include "iscsi_target_configfs.h"
 #include "iscsi_target_datain_values.h"
 #include "iscsi_target_erl0.h"
 #include "iscsi_target_erl1.h"
@@ -537,7 +535,7 @@ static struct iscsit_transport iscsi_target_transport = {
 
 static int __init iscsi_target_init_module(void)
 {
-        int ret = 0;
+        int ret = 0, size;
 
         pr_debug("iSCSI-Target "ISCSIT_VERSION"\n");
 
@@ -546,24 +544,21 @@ static int __init iscsi_target_init_module(void)
                 pr_err("Unable to allocate memory for iscsit_global\n");
                 return -1;
         }
+        spin_lock_init(&iscsit_global->ts_bitmap_lock);
         mutex_init(&auth_id_lock);
         spin_lock_init(&sess_idr_lock);
         idr_init(&tiqn_idr);
         idr_init(&sess_idr);
 
-        ret = iscsi_target_register_configfs();
-        if (ret < 0)
+        ret = target_register_template(&iscsi_ops);
+        if (ret)
                 goto out;
 
-        ret = iscsi_thread_set_init();
-        if (ret < 0)
+        size = BITS_TO_LONGS(ISCSIT_BITMAP_BITS) * sizeof(long);
+        iscsit_global->ts_bitmap = vzalloc(size);
+        if (!iscsit_global->ts_bitmap) {
+                pr_err("Unable to allocate iscsit_global->ts_bitmap\n");
                 goto configfs_out;
-
-        if (iscsi_allocate_thread_sets(TARGET_THREAD_SET_COUNT) !=
-                        TARGET_THREAD_SET_COUNT) {
-                pr_err("iscsi_allocate_thread_sets() returned"
-                        " unexpected value!\n");
-                goto ts_out1;
         }
 
         lio_qr_cache = kmem_cache_create("lio_qr_cache",
@@ -572,7 +567,7 @@ static int __init iscsi_target_init_module(void)
         if (!lio_qr_cache) {
                 pr_err("nable to kmem_cache_create() for"
                                 " lio_qr_cache\n");
-                goto ts_out2;
+                goto bitmap_out;
         }
 
         lio_dr_cache = kmem_cache_create("lio_dr_cache",
@@ -617,12 +612,13 @@ dr_out:
         kmem_cache_destroy(lio_dr_cache);
 qr_out:
         kmem_cache_destroy(lio_qr_cache);
-ts_out2:
-        iscsi_deallocate_thread_sets();
-ts_out1:
-        iscsi_thread_set_free();
+bitmap_out:
+        vfree(iscsit_global->ts_bitmap);
 configfs_out:
-        iscsi_target_deregister_configfs();
+        /* XXX: this probably wants it to be it's own unwind step.. */
+        if (iscsit_global->discovery_tpg)
+                iscsit_tpg_disable_portal_group(iscsit_global->discovery_tpg, 1);
+        target_unregister_template(&iscsi_ops);
 out:
         kfree(iscsit_global);
         return -ENOMEM;
@@ -630,8 +626,6 @@ out:
 
 static void __exit iscsi_target_cleanup_module(void)
 {
-        iscsi_deallocate_thread_sets();
-        iscsi_thread_set_free();
         iscsit_release_discovery_tpg();
         iscsit_unregister_transport(&iscsi_target_transport);
         kmem_cache_destroy(lio_qr_cache);
@@ -639,8 +633,15 @@ static void __exit iscsi_target_cleanup_module(void)
         kmem_cache_destroy(lio_ooo_cache);
         kmem_cache_destroy(lio_r2t_cache);
 
-        iscsi_target_deregister_configfs();
+        /*
+         * Shutdown discovery sessions and disable discovery TPG
+         */
+        if (iscsit_global->discovery_tpg)
+                iscsit_tpg_disable_portal_group(iscsit_global->discovery_tpg, 1);
 
+        target_unregister_template(&iscsi_ops);
+
+        vfree(iscsit_global->ts_bitmap);
         kfree(iscsit_global);
 }
 
@@ -990,7 +991,7 @@ int iscsit_setup_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
         /*
          * Initialize struct se_cmd descriptor from target_core_mod infrastructure
          */
-        transport_init_se_cmd(&cmd->se_cmd, &lio_target_fabric_configfs->tf_ops,
+        transport_init_se_cmd(&cmd->se_cmd, &iscsi_ops,
                         conn->sess->se_sess, be32_to_cpu(hdr->data_length),
                         cmd->data_direction, sam_task_attr,
                         cmd->sense_buffer + 2);
@@ -1805,8 +1806,7 @@ iscsit_handle_task_mgt_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
                 u8 tcm_function;
                 int ret;
 
-                transport_init_se_cmd(&cmd->se_cmd,
-                                      &lio_target_fabric_configfs->tf_ops,
+                transport_init_se_cmd(&cmd->se_cmd, &iscsi_ops,
                                       conn->sess->se_sess, 0, DMA_NONE,
                                       TCM_SIMPLE_TAG, cmd->sense_buffer + 2);
 
@@ -2155,7 +2155,6 @@ reject:
         cmd->text_in_ptr = NULL;
         return iscsit_reject_cmd(cmd, ISCSI_REASON_PROTOCOL_ERROR, buf);
 }
-EXPORT_SYMBOL(iscsit_handle_text_cmd);
 
 int iscsit_logout_closesession(struct iscsi_cmd *cmd, struct iscsi_conn *conn)
 {
@@ -3715,17 +3714,16 @@ static int iscsit_send_reject(
 
 void iscsit_thread_get_cpumask(struct iscsi_conn *conn)
 {
-        struct iscsi_thread_set *ts = conn->thread_set;
         int ord, cpu;
         /*
-         * thread_id is assigned from iscsit_global->ts_bitmap from
-         * within iscsi_thread_set.c:iscsi_allocate_thread_sets()
+         * bitmap_id is assigned from iscsit_global->ts_bitmap from
+         * within iscsit_start_kthreads()
          *
-         * Here we use thread_id to determine which CPU that this
-         * iSCSI connection's iscsi_thread_set will be scheduled to
+         * Here we use bitmap_id to determine which CPU that this
+         * iSCSI connection's RX/TX threads will be scheduled to
          * execute upon.
          */
-        ord = ts->thread_id % cpumask_weight(cpu_online_mask);
+        ord = conn->bitmap_id % cpumask_weight(cpu_online_mask);
         for_each_online_cpu(cpu) {
                 if (ord-- == 0) {
                         cpumask_set_cpu(cpu, conn->conn_cpumask);
@@ -3914,7 +3912,7 @@ check_rsp_state:
         switch (state) {
         case ISTATE_SEND_LOGOUTRSP:
                 if (!iscsit_logout_post_handler(cmd, conn))
-                        goto restart;
+                        return -ECONNRESET;
                 /* fall through */
         case ISTATE_SEND_STATUS:
         case ISTATE_SEND_ASYNCMSG:
@@ -3942,8 +3940,6 @@ check_rsp_state:
 
 err:
         return -1;
-restart:
-        return -EAGAIN;
 }
 
 static int iscsit_handle_response_queue(struct iscsi_conn *conn)
@@ -3970,21 +3966,13 @@ static int iscsit_handle_response_queue(struct iscsi_conn *conn)
 int iscsi_target_tx_thread(void *arg)
 {
         int ret = 0;
-        struct iscsi_conn *conn;
-        struct iscsi_thread_set *ts = arg;
+        struct iscsi_conn *conn = arg;
         /*
          * Allow ourselves to be interrupted by SIGINT so that a
          * connection recovery / failure event can be triggered externally.
          */
         allow_signal(SIGINT);
 
-restart:
-        conn = iscsi_tx_thread_pre_handler(ts);
-        if (!conn)
-                goto out;
-
-        ret = 0;
-
         while (!kthread_should_stop()) {
                 /*
                  * Ensure that both TX and RX per connection kthreads
@@ -3993,11 +3981,9 @@ restart:
                 iscsit_thread_check_cpumask(conn, current, 1);
 
                 wait_event_interruptible(conn->queues_wq,
-                                         !iscsit_conn_all_queues_empty(conn) ||
-                                         ts->status == ISCSI_THREAD_SET_RESET);
+                                         !iscsit_conn_all_queues_empty(conn));
 
-                if ((ts->status == ISCSI_THREAD_SET_RESET) ||
-                     signal_pending(current))
+                if (signal_pending(current))
                         goto transport_err;
 
 get_immediate:
@@ -4008,15 +3994,14 @@ get_immediate:
                 ret = iscsit_handle_response_queue(conn);
                 if (ret == 1)
                         goto get_immediate;
-                else if (ret == -EAGAIN)
-                        goto restart;
+                else if (ret == -ECONNRESET)
+                        goto out;
                 else if (ret < 0)
                         goto transport_err;
         }
 
 transport_err:
         iscsit_take_action_for_connection_exit(conn);
-        goto restart;
 out:
         return 0;
 }
@@ -4111,8 +4096,7 @@ int iscsi_target_rx_thread(void *arg)
         int ret;
         u8 buffer[ISCSI_HDR_LEN], opcode;
         u32 checksum = 0, digest = 0;
-        struct iscsi_conn *conn = NULL;
-        struct iscsi_thread_set *ts = arg;
+        struct iscsi_conn *conn = arg;
         struct kvec iov;
         /*
          * Allow ourselves to be interrupted by SIGINT so that a
@@ -4120,11 +4104,6 @@ int iscsi_target_rx_thread(void *arg)
          */
         allow_signal(SIGINT);
 
-restart:
-        conn = iscsi_rx_thread_pre_handler(ts);
-        if (!conn)
-                goto out;
-
         if (conn->conn_transport->transport_type == ISCSI_INFINIBAND) {
                 struct completion comp;
                 int rc;
@@ -4134,7 +4113,7 @@ restart:
                 if (rc < 0)
                         goto transport_err;
 
-                goto out;
+                goto transport_err;
         }
 
         while (!kthread_should_stop()) {
@@ -4210,8 +4189,6 @@ transport_err:
         if (!signal_pending(current))
                 atomic_set(&conn->transport_failed, 1);
         iscsit_take_action_for_connection_exit(conn);
-        goto restart;
-out:
         return 0;
 }
 
@@ -4273,7 +4250,24 @@ int iscsit_close_connection(
         if (conn->conn_transport->transport_type == ISCSI_TCP)
                 complete(&conn->conn_logout_comp);
 
-        iscsi_release_thread_set(conn);
+        if (!strcmp(current->comm, ISCSI_RX_THREAD_NAME)) {
+                if (conn->tx_thread &&
+                    cmpxchg(&conn->tx_thread_active, true, false)) {
+                        send_sig(SIGINT, conn->tx_thread, 1);
+                        kthread_stop(conn->tx_thread);
+                }
+        } else if (!strcmp(current->comm, ISCSI_TX_THREAD_NAME)) {
+                if (conn->rx_thread &&
+                    cmpxchg(&conn->rx_thread_active, true, false)) {
+                        send_sig(SIGINT, conn->rx_thread, 1);
+                        kthread_stop(conn->rx_thread);
+                }
+        }
+
+        spin_lock(&iscsit_global->ts_bitmap_lock);
+        bitmap_release_region(iscsit_global->ts_bitmap, conn->bitmap_id,
+                              get_order(1));
+        spin_unlock(&iscsit_global->ts_bitmap_lock);
 
         iscsit_stop_timers_for_cmds(conn);
         iscsit_stop_nopin_response_timer(conn);
@@ -4383,8 +4377,6 @@ int iscsit_close_connection(
 
         iscsit_put_transport(conn->conn_transport);
 
-        conn->thread_set = NULL;
-
         pr_debug("Moving to TARG_CONN_STATE_FREE.\n");
         conn->conn_state = TARG_CONN_STATE_FREE;
         kfree(conn);
@@ -4551,15 +4543,13 @@ static void iscsit_logout_post_handler_closesession(
         struct iscsi_conn *conn)
 {
         struct iscsi_session *sess = conn->sess;
-
-        iscsi_set_thread_clear(conn, ISCSI_CLEAR_TX_THREAD);
-        iscsi_set_thread_set_signal(conn, ISCSI_SIGNAL_TX_THREAD);
+        int sleep = cmpxchg(&conn->tx_thread_active, true, false);
 
         atomic_set(&conn->conn_logout_remove, 0);
         complete(&conn->conn_logout_comp);
 
         iscsit_dec_conn_usage_count(conn);
-        iscsit_stop_session(sess, 1, 1);
+        iscsit_stop_session(sess, sleep, sleep);
         iscsit_dec_session_usage_count(sess);
         target_put_session(sess->se_sess);
 }
@@ -4567,13 +4557,12 @@ static void iscsit_logout_post_handler_closesession(
 static void iscsit_logout_post_handler_samecid(
         struct iscsi_conn *conn)
 {
-        iscsi_set_thread_clear(conn, ISCSI_CLEAR_TX_THREAD);
-        iscsi_set_thread_set_signal(conn, ISCSI_SIGNAL_TX_THREAD);
+        int sleep = cmpxchg(&conn->tx_thread_active, true, false);
 
         atomic_set(&conn->conn_logout_remove, 0);
         complete(&conn->conn_logout_comp);
 
-        iscsit_cause_connection_reinstatement(conn, 1);
+        iscsit_cause_connection_reinstatement(conn, sleep);
         iscsit_dec_conn_usage_count(conn);
 }
 
diff --git a/drivers/target/iscsi/iscsi_target.h b/drivers/target/iscsi/iscsi_target.h
index e936d56fb523..7d0f9c00d9c2 100644
--- a/drivers/target/iscsi/iscsi_target.h
+++ b/drivers/target/iscsi/iscsi_target.h
@@ -35,7 +35,7 @@ extern void iscsit_stop_session(struct iscsi_session *, int, int);
 extern int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *, int);
 
 extern struct iscsit_global *iscsit_global;
-extern struct target_fabric_configfs *lio_target_fabric_configfs;
+extern const struct target_core_fabric_ops iscsi_ops;
 
 extern struct kmem_cache *lio_dr_cache;
 extern struct kmem_cache *lio_ooo_cache;
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index 48384b675e62..469fce44ebad 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -37,9 +37,6 @@
 #include "iscsi_target_util.h"
 #include "iscsi_target.h"
 #include <target/iscsi/iscsi_target_stat.h>
-#include "iscsi_target_configfs.h"
-
-struct target_fabric_configfs *lio_target_fabric_configfs;
 
 struct lio_target_configfs_attribute {
         struct configfs_attribute attr;
@@ -1052,6 +1049,11 @@ TPG_ATTR(default_erl, S_IRUGO | S_IWUSR);
  */
 DEF_TPG_ATTRIB(t10_pi);
 TPG_ATTR(t10_pi, S_IRUGO | S_IWUSR);
+/*
+ * Define iscsi_tpg_attrib_s_fabric_prot_type
+ */
+DEF_TPG_ATTRIB(fabric_prot_type);
+TPG_ATTR(fabric_prot_type, S_IRUGO | S_IWUSR);
 
 static struct configfs_attribute *lio_target_tpg_attrib_attrs[] = {
         &iscsi_tpg_attrib_authentication.attr,
@@ -1065,6 +1067,7 @@ static struct configfs_attribute *lio_target_tpg_attrib_attrs[] = {
         &iscsi_tpg_attrib_demo_mode_discovery.attr,
         &iscsi_tpg_attrib_default_erl.attr,
         &iscsi_tpg_attrib_t10_pi.attr,
+        &iscsi_tpg_attrib_fabric_prot_type.attr,
         NULL,
 };
 
@@ -1410,8 +1413,18 @@ out:
 
 TF_TPG_BASE_ATTR(lio_target, enable, S_IRUGO | S_IWUSR);
 
+static ssize_t lio_target_tpg_show_dynamic_sessions(
+        struct se_portal_group *se_tpg,
+        char *page)
+{
+        return target_show_dynamic_sessions(se_tpg, page);
+}
+
+TF_TPG_BASE_ATTR_RO(lio_target, dynamic_sessions);
+
 static struct configfs_attribute *lio_target_tpg_attrs[] = {
         &lio_target_tpg_enable.attr,
+        &lio_target_tpg_dynamic_sessions.attr,
         NULL,
 };
 
@@ -1450,10 +1463,8 @@ static struct se_portal_group *lio_target_tiqn_addtpg(
         if (!tpg)
                 return NULL;
 
-        ret = core_tpg_register(
-                        &lio_target_fabric_configfs->tf_ops,
-                        wwn, &tpg->tpg_se_tpg, tpg,
-                        TRANSPORT_TPG_TYPE_NORMAL);
+        ret = core_tpg_register(&iscsi_ops, wwn, &tpg->tpg_se_tpg,
+                                tpg, TRANSPORT_TPG_TYPE_NORMAL);
         if (ret < 0)
                 return NULL;
 
@@ -1872,6 +1883,20 @@ static int lio_tpg_check_prod_mode_write_protect(
         return tpg->tpg_attrib.prod_mode_write_protect;
 }
 
+static int lio_tpg_check_prot_fabric_only(
+        struct se_portal_group *se_tpg)
+{
+        struct iscsi_portal_group *tpg = se_tpg->se_tpg_fabric_ptr;
+        /*
+         * Only report fabric_prot_type if t10_pi has also been enabled
+         * for incoming ib_isert sessions.
+         */
+        if (!tpg->tpg_attrib.t10_pi)
+                return 0;
+
+        return tpg->tpg_attrib.fabric_prot_type;
+}
+
 static void lio_tpg_release_fabric_acl(
         struct se_portal_group *se_tpg,
         struct se_node_acl *se_acl)
@@ -1953,115 +1978,60 @@ static void lio_release_cmd(struct se_cmd *se_cmd)
         iscsit_release_cmd(cmd);
 }
 
-/* End functions for target_core_fabric_ops */
-
-int iscsi_target_register_configfs(void)
-{
-        struct target_fabric_configfs *fabric;
-        int ret;
-
-        lio_target_fabric_configfs = NULL;
-        fabric = target_fabric_configfs_init(THIS_MODULE, "iscsi");
-        if (IS_ERR(fabric)) {
-                pr_err("target_fabric_configfs_init() for"
-                                " LIO-Target failed!\n");
-                return PTR_ERR(fabric);
-        }
-        /*
-         * Setup the fabric API of function pointers used by target_core_mod..
-         */
-        fabric->tf_ops.get_fabric_name = &iscsi_get_fabric_name;
-        fabric->tf_ops.get_fabric_proto_ident = &iscsi_get_fabric_proto_ident;
-        fabric->tf_ops.tpg_get_wwn = &lio_tpg_get_endpoint_wwn;
-        fabric->tf_ops.tpg_get_tag = &lio_tpg_get_tag;
-        fabric->tf_ops.tpg_get_default_depth = &lio_tpg_get_default_depth;
-        fabric->tf_ops.tpg_get_pr_transport_id = &iscsi_get_pr_transport_id;
-        fabric->tf_ops.tpg_get_pr_transport_id_len =
-                                &iscsi_get_pr_transport_id_len;
-        fabric->tf_ops.tpg_parse_pr_out_transport_id =
-                                &iscsi_parse_pr_out_transport_id;
-        fabric->tf_ops.tpg_check_demo_mode = &lio_tpg_check_demo_mode;
-        fabric->tf_ops.tpg_check_demo_mode_cache =
-                                &lio_tpg_check_demo_mode_cache;
-        fabric->tf_ops.tpg_check_demo_mode_write_protect =
-                                &lio_tpg_check_demo_mode_write_protect;
-        fabric->tf_ops.tpg_check_prod_mode_write_protect =
-                                &lio_tpg_check_prod_mode_write_protect;
-        fabric->tf_ops.tpg_alloc_fabric_acl = &lio_tpg_alloc_fabric_acl;
-        fabric->tf_ops.tpg_release_fabric_acl = &lio_tpg_release_fabric_acl;
-        fabric->tf_ops.tpg_get_inst_index = &lio_tpg_get_inst_index;
-        fabric->tf_ops.check_stop_free = &lio_check_stop_free,
-        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.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;
-        fabric->tf_ops.write_pending_status = &lio_write_pending_status;
-        fabric->tf_ops.set_default_node_attributes =
-                                &lio_set_default_node_attributes;
-        fabric->tf_ops.get_task_tag = &iscsi_get_task_tag;
-        fabric->tf_ops.get_cmd_state = &iscsi_get_cmd_state;
-        fabric->tf_ops.queue_data_in = &lio_queue_data_in;
-        fabric->tf_ops.queue_status = &lio_queue_status;
-        fabric->tf_ops.queue_tm_rsp = &lio_queue_tm_rsp;
-        fabric->tf_ops.aborted_task = &lio_aborted_task;
-        /*
-         * Setup function pointers for generic logic in target_core_fabric_configfs.c
-         */
-        fabric->tf_ops.fabric_make_wwn = &lio_target_call_coreaddtiqn;
-        fabric->tf_ops.fabric_drop_wwn = &lio_target_call_coredeltiqn;
-        fabric->tf_ops.fabric_make_tpg = &lio_target_tiqn_addtpg;
-        fabric->tf_ops.fabric_drop_tpg = &lio_target_tiqn_deltpg;
-        fabric->tf_ops.fabric_post_link = NULL;
-        fabric->tf_ops.fabric_pre_unlink = NULL;
-        fabric->tf_ops.fabric_make_np = &lio_target_call_addnptotpg;
-        fabric->tf_ops.fabric_drop_np = &lio_target_call_delnpfromtpg;
-        fabric->tf_ops.fabric_make_nodeacl = &lio_target_make_nodeacl;
-        fabric->tf_ops.fabric_drop_nodeacl = &lio_target_drop_nodeacl;
-        /*
-         * Setup default attribute lists for various fabric->tf_cit_tmpl
-         * sturct config_item_type's
-         */
-        fabric->tf_cit_tmpl.tfc_discovery_cit.ct_attrs = lio_target_discovery_auth_attrs;
-        fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = lio_target_wwn_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = lio_target_tpg_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = lio_target_tpg_attrib_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_auth_cit.ct_attrs = lio_target_tpg_auth_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = lio_target_tpg_param_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = lio_target_portal_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = lio_target_initiator_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = lio_target_nacl_attrib_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = lio_target_nacl_auth_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = lio_target_nacl_param_attrs;
-
-        ret = target_fabric_configfs_register(fabric);
-        if (ret < 0) {
-                pr_err("target_fabric_configfs_register() for"
-                                " LIO-Target failed!\n");
-                target_fabric_configfs_free(fabric);
-                return ret;
-        }
-
-        lio_target_fabric_configfs = fabric;
-        pr_debug("LIO_TARGET[0] - Set fabric ->"
-                        " lio_target_fabric_configfs\n");
-        return 0;
-}
-
-
-void iscsi_target_deregister_configfs(void)
-{
-        if (!lio_target_fabric_configfs)
-                return;
-        /*
-         * Shutdown discovery sessions and disable discovery TPG
-         */
-        if (iscsit_global->discovery_tpg)
-                iscsit_tpg_disable_portal_group(iscsit_global->discovery_tpg, 1);
-
-        target_fabric_configfs_deregister(lio_target_fabric_configfs);
-        lio_target_fabric_configfs = NULL;
-        pr_debug("LIO_TARGET[0] - Cleared"
-                                " lio_target_fabric_configfs\n");
-}
+const struct target_core_fabric_ops iscsi_ops = {
+        .module                         = THIS_MODULE,
+        .name                           = "iscsi",
+        .get_fabric_name                = iscsi_get_fabric_name,
+        .get_fabric_proto_ident         = iscsi_get_fabric_proto_ident,
+        .tpg_get_wwn                    = lio_tpg_get_endpoint_wwn,
+        .tpg_get_tag                    = lio_tpg_get_tag,
+        .tpg_get_default_depth          = lio_tpg_get_default_depth,
+        .tpg_get_pr_transport_id        = iscsi_get_pr_transport_id,
+        .tpg_get_pr_transport_id_len    = iscsi_get_pr_transport_id_len,
+        .tpg_parse_pr_out_transport_id  = iscsi_parse_pr_out_transport_id,
+        .tpg_check_demo_mode            = lio_tpg_check_demo_mode,
+        .tpg_check_demo_mode_cache      = lio_tpg_check_demo_mode_cache,
+        .tpg_check_demo_mode_write_protect =
+                        lio_tpg_check_demo_mode_write_protect,
+        .tpg_check_prod_mode_write_protect =
+                        lio_tpg_check_prod_mode_write_protect,
+        .tpg_check_prot_fabric_only     = &lio_tpg_check_prot_fabric_only,
+        .tpg_alloc_fabric_acl           = lio_tpg_alloc_fabric_acl,
+        .tpg_release_fabric_acl         = lio_tpg_release_fabric_acl,
+        .tpg_get_inst_index             = lio_tpg_get_inst_index,
+        .check_stop_free                = lio_check_stop_free,
+        .release_cmd                    = lio_release_cmd,
+        .shutdown_session               = lio_tpg_shutdown_session,
+        .close_session                  = lio_tpg_close_session,
+        .sess_get_index                 = lio_sess_get_index,
+        .sess_get_initiator_sid         = lio_sess_get_initiator_sid,
+        .write_pending                  = lio_write_pending,
+        .write_pending_status           = lio_write_pending_status,
+        .set_default_node_attributes    = lio_set_default_node_attributes,
+        .get_task_tag                   = iscsi_get_task_tag,
+        .get_cmd_state                  = iscsi_get_cmd_state,
+        .queue_data_in                  = lio_queue_data_in,
+        .queue_status                   = lio_queue_status,
+        .queue_tm_rsp                   = lio_queue_tm_rsp,
+        .aborted_task                   = lio_aborted_task,
+        .fabric_make_wwn                = lio_target_call_coreaddtiqn,
+        .fabric_drop_wwn                = lio_target_call_coredeltiqn,
+        .fabric_make_tpg                = lio_target_tiqn_addtpg,
+        .fabric_drop_tpg                = lio_target_tiqn_deltpg,
+        .fabric_make_np                 = lio_target_call_addnptotpg,
+        .fabric_drop_np                 = lio_target_call_delnpfromtpg,
+        .fabric_make_nodeacl            = lio_target_make_nodeacl,
+        .fabric_drop_nodeacl            = lio_target_drop_nodeacl,
+
+        .tfc_discovery_attrs            = lio_target_discovery_auth_attrs,
+        .tfc_wwn_attrs                  = lio_target_wwn_attrs,
+        .tfc_tpg_base_attrs             = lio_target_tpg_attrs,
+        .tfc_tpg_attrib_attrs           = lio_target_tpg_attrib_attrs,
+        .tfc_tpg_auth_attrs             = lio_target_tpg_auth_attrs,
+        .tfc_tpg_param_attrs            = lio_target_tpg_param_attrs,
+        .tfc_tpg_np_base_attrs          = lio_target_portal_attrs,
+        .tfc_tpg_nacl_base_attrs        = lio_target_initiator_attrs,
+        .tfc_tpg_nacl_attrib_attrs      = lio_target_nacl_attrib_attrs,
+        .tfc_tpg_nacl_auth_attrs        = lio_target_nacl_auth_attrs,
+        .tfc_tpg_nacl_param_attrs       = lio_target_nacl_param_attrs,
+};
diff --git a/drivers/target/iscsi/iscsi_target_configfs.h b/drivers/target/iscsi/iscsi_target_configfs.h
deleted file mode 100644
index 8cd5a63c4edc..000000000000
--- a/drivers/target/iscsi/iscsi_target_configfs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef ISCSI_TARGET_CONFIGFS_H
-#define ISCSI_TARGET_CONFIGFS_H
-
-extern int iscsi_target_register_configfs(void);
-extern void iscsi_target_deregister_configfs(void);
-
-#endif /* ISCSI_TARGET_CONFIGFS_H */
diff --git a/drivers/target/iscsi/iscsi_target_erl0.c b/drivers/target/iscsi/iscsi_target_erl0.c
index bdd8731a4daa..959a14c9dd5d 100644
--- a/drivers/target/iscsi/iscsi_target_erl0.c
+++ b/drivers/target/iscsi/iscsi_target_erl0.c
@@ -23,7 +23,6 @@
 
 #include <target/iscsi/iscsi_target_core.h>
 #include "iscsi_target_seq_pdu_list.h"
-#include "iscsi_target_tq.h"
 #include "iscsi_target_erl0.h"
 #include "iscsi_target_erl1.h"
 #include "iscsi_target_erl2.h"
@@ -860,7 +859,10 @@ void iscsit_connection_reinstatement_rcfr(struct iscsi_conn *conn)
         }
         spin_unlock_bh(&conn->state_lock);
 
-        iscsi_thread_set_force_reinstatement(conn);
+        if (conn->tx_thread && conn->tx_thread_active)
+                send_sig(SIGINT, conn->tx_thread, 1);
+        if (conn->rx_thread && conn->rx_thread_active)
+                send_sig(SIGINT, conn->rx_thread, 1);
 
 sleep:
         wait_for_completion(&conn->conn_wait_rcfr_comp);
@@ -885,10 +887,10 @@ void iscsit_cause_connection_reinstatement(struct iscsi_conn *conn, int sleep)
                 return;
         }
 
-        if (iscsi_thread_set_force_reinstatement(conn) < 0) {
-                spin_unlock_bh(&conn->state_lock);
-                return;
-        }
+        if (conn->tx_thread && conn->tx_thread_active)
+                send_sig(SIGINT, conn->tx_thread, 1);
+        if (conn->rx_thread && conn->rx_thread_active)
+                send_sig(SIGINT, conn->rx_thread, 1);
 
         atomic_set(&conn->connection_reinstatement, 1);
         if (!sleep) {
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index 153fb66ac1b8..8ce94ff744e6 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -26,7 +26,6 @@
 
 #include <target/iscsi/iscsi_target_core.h>
 #include <target/iscsi/iscsi_target_stat.h>
-#include "iscsi_target_tq.h"
 #include "iscsi_target_device.h"
 #include "iscsi_target_nego.h"
 #include "iscsi_target_erl0.h"
@@ -699,6 +698,51 @@ static void iscsi_post_login_start_timers(struct iscsi_conn *conn)
                 iscsit_start_nopin_timer(conn);
 }
 
+static int iscsit_start_kthreads(struct iscsi_conn *conn)
+{
+        int ret = 0;
+
+        spin_lock(&iscsit_global->ts_bitmap_lock);
+        conn->bitmap_id = bitmap_find_free_region(iscsit_global->ts_bitmap,
+                                        ISCSIT_BITMAP_BITS, get_order(1));
+        spin_unlock(&iscsit_global->ts_bitmap_lock);
+
+        if (conn->bitmap_id < 0) {
+                pr_err("bitmap_find_free_region() failed for"
+                       " iscsit_start_kthreads()\n");
+                return -ENOMEM;
+        }
+
+        conn->tx_thread = kthread_run(iscsi_target_tx_thread, conn,
+                                      "%s", ISCSI_TX_THREAD_NAME);
+        if (IS_ERR(conn->tx_thread)) {
+                pr_err("Unable to start iscsi_target_tx_thread\n");
+                ret = PTR_ERR(conn->tx_thread);
+                goto out_bitmap;
+        }
+        conn->tx_thread_active = true;
+
+        conn->rx_thread = kthread_run(iscsi_target_rx_thread, conn,
+                                      "%s", ISCSI_RX_THREAD_NAME);
+        if (IS_ERR(conn->rx_thread)) {
+                pr_err("Unable to start iscsi_target_rx_thread\n");
+                ret = PTR_ERR(conn->rx_thread);
+                goto out_tx;
+        }
+        conn->rx_thread_active = true;
+
+        return 0;
+out_tx:
+        kthread_stop(conn->tx_thread);
+        conn->tx_thread_active = false;
+out_bitmap:
+        spin_lock(&iscsit_global->ts_bitmap_lock);
+        bitmap_release_region(iscsit_global->ts_bitmap, conn->bitmap_id,
+                              get_order(1));
+        spin_unlock(&iscsit_global->ts_bitmap_lock);
+        return ret;
+}
+
 int iscsi_post_login_handler(
         struct iscsi_np *np,
         struct iscsi_conn *conn,
@@ -709,7 +753,7 @@ int iscsi_post_login_handler(
         struct se_session *se_sess = sess->se_sess;
         struct iscsi_portal_group *tpg = sess->tpg;
         struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;
-        struct iscsi_thread_set *ts;
+        int rc;
 
         iscsit_inc_conn_usage_count(conn);
 
@@ -724,7 +768,6 @@ int iscsi_post_login_handler(
         /*
          * SCSI Initiator -> SCSI Target Port Mapping
          */
-        ts = iscsi_get_thread_set();
         if (!zero_tsih) {
                 iscsi_set_session_parameters(sess->sess_ops,
                                 conn->param_list, 0);
@@ -751,9 +794,11 @@ int iscsi_post_login_handler(
                         sess->sess_ops->InitiatorName);
                 spin_unlock_bh(&sess->conn_lock);
 
-                iscsi_post_login_start_timers(conn);
+                rc = iscsit_start_kthreads(conn);
+                if (rc)
+                        return rc;
 
-                iscsi_activate_thread_set(conn, ts);
+                iscsi_post_login_start_timers(conn);
                 /*
                  * Determine CPU mask to ensure connection's RX and TX kthreads
                  * are scheduled on the same CPU.
@@ -810,8 +855,11 @@ int iscsi_post_login_handler(
                 " iSCSI Target Portal Group: %hu\n", tpg->nsessions, tpg->tpgt);
         spin_unlock_bh(&se_tpg->session_lock);
 
+        rc = iscsit_start_kthreads(conn);
+        if (rc)
+                return rc;
+
         iscsi_post_login_start_timers(conn);
-        iscsi_activate_thread_set(conn, ts);
         /*
          * Determine CPU mask to ensure connection's RX and TX kthreads
          * are scheduled on the same CPU.
diff --git a/drivers/target/iscsi/iscsi_target_tpg.c b/drivers/target/iscsi/iscsi_target_tpg.c
index bdd127c0e3ae..e8a240818353 100644
--- a/drivers/target/iscsi/iscsi_target_tpg.c
+++ b/drivers/target/iscsi/iscsi_target_tpg.c
@@ -68,10 +68,8 @@ int iscsit_load_discovery_tpg(void)
                 return -1;
         }
 
-        ret = core_tpg_register(
-                        &lio_target_fabric_configfs->tf_ops,
-                        NULL, &tpg->tpg_se_tpg, tpg,
-                        TRANSPORT_TPG_TYPE_DISCOVERY);
+        ret = core_tpg_register(&iscsi_ops, NULL, &tpg->tpg_se_tpg,
+                                tpg, TRANSPORT_TPG_TYPE_DISCOVERY);
         if (ret < 0) {
                 kfree(tpg);
                 return -1;
@@ -228,6 +226,7 @@ static void iscsit_set_default_tpg_attribs(struct iscsi_portal_group *tpg)
         a->demo_mode_discovery = TA_DEMO_MODE_DISCOVERY;
         a->default_erl = TA_DEFAULT_ERL;
         a->t10_pi = TA_DEFAULT_T10_PI;
+        a->fabric_prot_type = TA_DEFAULT_FABRIC_PROT_TYPE;
 }
 
 int iscsit_tpg_add_portal_group(struct iscsi_tiqn *tiqn, struct iscsi_portal_group *tpg)
@@ -878,3 +877,21 @@ int iscsit_ta_t10_pi(
 
         return 0;
 }
+
+int iscsit_ta_fabric_prot_type(
+        struct iscsi_portal_group *tpg,
+        u32 prot_type)
+{
+        struct iscsi_tpg_attrib *a = &tpg->tpg_attrib;
+
+        if ((prot_type != 0) && (prot_type != 1) && (prot_type != 3)) {
+                pr_err("Illegal value for fabric_prot_type: %u\n", prot_type);
+                return -EINVAL;
+        }
+
+        a->fabric_prot_type = prot_type;
+        pr_debug("iSCSI_TPG[%hu] - T10 Fabric Protection Type: %u\n",
+                 tpg->tpgt, prot_type);
+
+        return 0;
+}
diff --git a/drivers/target/iscsi/iscsi_target_tpg.h b/drivers/target/iscsi/iscsi_target_tpg.h
index e7265337bc43..95ff5bdecd71 100644
--- a/drivers/target/iscsi/iscsi_target_tpg.h
+++ b/drivers/target/iscsi/iscsi_target_tpg.h
@@ -39,5 +39,6 @@ extern int iscsit_ta_prod_mode_write_protect(struct iscsi_portal_group *, u32);
 extern int iscsit_ta_demo_mode_discovery(struct iscsi_portal_group *, u32);
 extern int iscsit_ta_default_erl(struct iscsi_portal_group *, u32);
 extern int iscsit_ta_t10_pi(struct iscsi_portal_group *, u32);
+extern int iscsit_ta_fabric_prot_type(struct iscsi_portal_group *, u32);
 
 #endif /* ISCSI_TARGET_TPG_H */
diff --git a/drivers/target/iscsi/iscsi_target_tq.c b/drivers/target/iscsi/iscsi_target_tq.c
deleted file mode 100644
index 26aa50996473..000000000000
--- a/drivers/target/iscsi/iscsi_target_tq.c
+++ /dev/null
@@ -1,495 +0,0 @@
-/*******************************************************************************
- * This file contains the iSCSI Login Thread and Thread Queue functions.
- *
- * (c) Copyright 2007-2013 Datera, Inc.
- *
- * Author: Nicholas A. Bellinger <nab@linux-iscsi.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- ******************************************************************************/
-
-#include <linux/kthread.h>
-#include <linux/list.h>
-#include <linux/bitmap.h>
-
-#include <target/iscsi/iscsi_target_core.h>
-#include "iscsi_target_tq.h"
-#include "iscsi_target.h"
-
-static LIST_HEAD(inactive_ts_list);
-static DEFINE_SPINLOCK(inactive_ts_lock);
-static DEFINE_SPINLOCK(ts_bitmap_lock);
-
-static void iscsi_add_ts_to_inactive_list(struct iscsi_thread_set *ts)
-{
-        if (!list_empty(&ts->ts_list)) {
-                WARN_ON(1);
-                return;
-        }
-        spin_lock(&inactive_ts_lock);
-        list_add_tail(&ts->ts_list, &inactive_ts_list);
-        iscsit_global->inactive_ts++;
-        spin_unlock(&inactive_ts_lock);
-}
-
-static struct iscsi_thread_set *iscsi_get_ts_from_inactive_list(void)
-{
-        struct iscsi_thread_set *ts;
-
-        spin_lock(&inactive_ts_lock);
-        if (list_empty(&inactive_ts_list)) {
-                spin_unlock(&inactive_ts_lock);
-                return NULL;
-        }
-
-        ts = list_first_entry(&inactive_ts_list, struct iscsi_thread_set, ts_list);
-
-        list_del_init(&ts->ts_list);
-        iscsit_global->inactive_ts--;
-        spin_unlock(&inactive_ts_lock);
-
-        return ts;
-}
-
-int iscsi_allocate_thread_sets(u32 thread_pair_count)
-{
-        int allocated_thread_pair_count = 0, i, thread_id;
-        struct iscsi_thread_set *ts = NULL;
-
-        for (i = 0; i < thread_pair_count; i++) {
-                ts = kzalloc(sizeof(struct iscsi_thread_set), GFP_KERNEL);
-                if (!ts) {
-                        pr_err("Unable to allocate memory for"
-                                        " thread set.\n");
-                        return allocated_thread_pair_count;
-                }
-                /*
-                 * Locate the next available regision in the thread_set_bitmap
-                 */
-                spin_lock(&ts_bitmap_lock);
-                thread_id = bitmap_find_free_region(iscsit_global->ts_bitmap,
-                                iscsit_global->ts_bitmap_count, get_order(1));
-                spin_unlock(&ts_bitmap_lock);
-                if (thread_id < 0) {
-                        pr_err("bitmap_find_free_region() failed for"
-                                " thread_set_bitmap\n");
-                        kfree(ts);
-                        return allocated_thread_pair_count;
-                }
-
-                ts->thread_id = thread_id;
-                ts->status = ISCSI_THREAD_SET_FREE;
-                INIT_LIST_HEAD(&ts->ts_list);
-                spin_lock_init(&ts->ts_state_lock);
-                init_completion(&ts->rx_restart_comp);
-                init_completion(&ts->tx_restart_comp);
-                init_completion(&ts->rx_start_comp);
-                init_completion(&ts->tx_start_comp);
-                sema_init(&ts->ts_activate_sem, 0);
-
-                ts->create_threads = 1;
-                ts->tx_thread = kthread_run(iscsi_target_tx_thread, ts, "%s",
-                                        ISCSI_TX_THREAD_NAME);
-                if (IS_ERR(ts->tx_thread)) {
-                        dump_stack();
-                        pr_err("Unable to start iscsi_target_tx_thread\n");
-                        break;
-                }
-
-                ts->rx_thread = kthread_run(iscsi_target_rx_thread, ts, "%s",
-                                        ISCSI_RX_THREAD_NAME);
-                if (IS_ERR(ts->rx_thread)) {
-                        kthread_stop(ts->tx_thread);
-                        pr_err("Unable to start iscsi_target_rx_thread\n");
-                        break;
-                }
-                ts->create_threads = 0;
-
-                iscsi_add_ts_to_inactive_list(ts);
-                allocated_thread_pair_count++;
-        }
-
-        pr_debug("Spawned %d thread set(s) (%d total threads).\n",
-                allocated_thread_pair_count, allocated_thread_pair_count * 2);
-        return allocated_thread_pair_count;
-}
-
-static void iscsi_deallocate_thread_one(struct iscsi_thread_set *ts)
-{
-        spin_lock_bh(&ts->ts_state_lock);
-        ts->status = ISCSI_THREAD_SET_DIE;
-
-        if (ts->rx_thread) {
-                complete(&ts->rx_start_comp);
-                spin_unlock_bh(&ts->ts_state_lock);
-                kthread_stop(ts->rx_thread);
-                spin_lock_bh(&ts->ts_state_lock);
-        }
-        if (ts->tx_thread) {
-                complete(&ts->tx_start_comp);
-                spin_unlock_bh(&ts->ts_state_lock);
-                kthread_stop(ts->tx_thread);
-                spin_lock_bh(&ts->ts_state_lock);
-        }
-        spin_unlock_bh(&ts->ts_state_lock);
-        /*
-         * Release this thread_id in the thread_set_bitmap
-         */
-        spin_lock(&ts_bitmap_lock);
-        bitmap_release_region(iscsit_global->ts_bitmap,
-                        ts->thread_id, get_order(1));
-        spin_unlock(&ts_bitmap_lock);
-
-        kfree(ts);
-}
-
-void iscsi_deallocate_thread_sets(void)
-{
-        struct iscsi_thread_set *ts = NULL;
-        u32 released_count = 0;
-
-        while ((ts = iscsi_get_ts_from_inactive_list())) {
-
-                iscsi_deallocate_thread_one(ts);
-                released_count++;
-        }
-
-        if (released_count)
-                pr_debug("Stopped %d thread set(s) (%d total threads)."
-                        "\n", released_count, released_count * 2);
-}
-
-static void iscsi_deallocate_extra_thread_sets(void)
-{
-        u32 orig_count, released_count = 0;
-        struct iscsi_thread_set *ts = NULL;
-
-        orig_count = TARGET_THREAD_SET_COUNT;
-
-        while ((iscsit_global->inactive_ts + 1) > orig_count) {
-                ts = iscsi_get_ts_from_inactive_list();
-                if (!ts)
-                        break;
-
-                iscsi_deallocate_thread_one(ts);
-                released_count++;
-        }
-
-        if (released_count)
-                pr_debug("Stopped %d thread set(s) (%d total threads)."
-                        "\n", released_count, released_count * 2);
-}
-
-void iscsi_activate_thread_set(struct iscsi_conn *conn, struct iscsi_thread_set *ts)
-{
-        spin_lock_bh(&ts->ts_state_lock);
-        conn->thread_set = ts;
-        ts->conn = conn;
-        ts->status = ISCSI_THREAD_SET_ACTIVE;
-        spin_unlock_bh(&ts->ts_state_lock);
-
-        complete(&ts->rx_start_comp);
-        complete(&ts->tx_start_comp);
-
-        down(&ts->ts_activate_sem);
-}
-
-struct iscsi_thread_set *iscsi_get_thread_set(void)
-{
-        struct iscsi_thread_set *ts;
-
-get_set:
-        ts = iscsi_get_ts_from_inactive_list();
-        if (!ts) {
-                iscsi_allocate_thread_sets(1);
-                goto get_set;
-        }
-
-        ts->delay_inactive = 1;
-        ts->signal_sent = 0;
-        ts->thread_count = 2;
-        init_completion(&ts->rx_restart_comp);
-        init_completion(&ts->tx_restart_comp);
-        sema_init(&ts->ts_activate_sem, 0);
-
-        return ts;
-}
-
-void iscsi_set_thread_clear(struct iscsi_conn *conn, u8 thread_clear)
-{
-        struct iscsi_thread_set *ts = NULL;
-
-        if (!conn->thread_set) {
-                pr_err("struct iscsi_conn->thread_set is NULL\n");
-                return;
-        }
-        ts = conn->thread_set;
-
-        spin_lock_bh(&ts->ts_state_lock);
-        ts->thread_clear &= ~thread_clear;
-
-        if ((thread_clear & ISCSI_CLEAR_RX_THREAD) &&
-            (ts->blocked_threads & ISCSI_BLOCK_RX_THREAD))
-                complete(&ts->rx_restart_comp);
-        else if ((thread_clear & ISCSI_CLEAR_TX_THREAD) &&
-                 (ts->blocked_threads & ISCSI_BLOCK_TX_THREAD))
-                complete(&ts->tx_restart_comp);
-        spin_unlock_bh(&ts->ts_state_lock);
-}
-
-void iscsi_set_thread_set_signal(struct iscsi_conn *conn, u8 signal_sent)
-{
-        struct iscsi_thread_set *ts = NULL;
-
-        if (!conn->thread_set) {
-                pr_err("struct iscsi_conn->thread_set is NULL\n");
-                return;
-        }
-        ts = conn->thread_set;
-
-        spin_lock_bh(&ts->ts_state_lock);
-        ts->signal_sent |= signal_sent;
-        spin_unlock_bh(&ts->ts_state_lock);
-}
-
-int iscsi_release_thread_set(struct iscsi_conn *conn)
-{
-        int thread_called = 0;
-        struct iscsi_thread_set *ts = NULL;
-
-        if (!conn || !conn->thread_set) {
-                pr_err("connection or thread set pointer is NULL\n");
-                BUG();
-        }
-        ts = conn->thread_set;
-
-        spin_lock_bh(&ts->ts_state_lock);
-        ts->status = ISCSI_THREAD_SET_RESET;
-
-        if (!strncmp(current->comm, ISCSI_RX_THREAD_NAME,
-                        strlen(ISCSI_RX_THREAD_NAME)))
-                thread_called = ISCSI_RX_THREAD;
-        else if (!strncmp(current->comm, ISCSI_TX_THREAD_NAME,
-                        strlen(ISCSI_TX_THREAD_NAME)))
-                thread_called = ISCSI_TX_THREAD;
-
-        if (ts->rx_thread && (thread_called == ISCSI_TX_THREAD) &&
-           (ts->thread_clear & ISCSI_CLEAR_RX_THREAD)) {
-
-                if (!(ts->signal_sent & ISCSI_SIGNAL_RX_THREAD)) {
-                        send_sig(SIGINT, ts->rx_thread, 1);
-                        ts->signal_sent |= ISCSI_SIGNAL_RX_THREAD;
-                }
-                ts->blocked_threads |= ISCSI_BLOCK_RX_THREAD;
-                spin_unlock_bh(&ts->ts_state_lock);
-                wait_for_completion(&ts->rx_restart_comp);
-                spin_lock_bh(&ts->ts_state_lock);
-                ts->blocked_threads &= ~ISCSI_BLOCK_RX_THREAD;
-        }
-        if (ts->tx_thread && (thread_called == ISCSI_RX_THREAD) &&
-           (ts->thread_clear & ISCSI_CLEAR_TX_THREAD)) {
-
-                if (!(ts->signal_sent & ISCSI_SIGNAL_TX_THREAD)) {
-                        send_sig(SIGINT, ts->tx_thread, 1);
-                        ts->signal_sent |= ISCSI_SIGNAL_TX_THREAD;
-                }
-                ts->blocked_threads |= ISCSI_BLOCK_TX_THREAD;
-                spin_unlock_bh(&ts->ts_state_lock);
-                wait_for_completion(&ts->tx_restart_comp);
-                spin_lock_bh(&ts->ts_state_lock);
-                ts->blocked_threads &= ~ISCSI_BLOCK_TX_THREAD;
-        }
-
-        ts->conn = NULL;
-        ts->status = ISCSI_THREAD_SET_FREE;
-        spin_unlock_bh(&ts->ts_state_lock);
-
-        return 0;
-}
-
-int iscsi_thread_set_force_reinstatement(struct iscsi_conn *conn)
-{
-        struct iscsi_thread_set *ts;
-
-        if (!conn->thread_set)
-                return -1;
-        ts = conn->thread_set;
-
-        spin_lock_bh(&ts->ts_state_lock);
-        if (ts->status != ISCSI_THREAD_SET_ACTIVE) {
-                spin_unlock_bh(&ts->ts_state_lock);
-                return -1;
-        }
-
-        if (ts->tx_thread && (!(ts->signal_sent & ISCSI_SIGNAL_TX_THREAD))) {
-                send_sig(SIGINT, ts->tx_thread, 1);
-                ts->signal_sent |= ISCSI_SIGNAL_TX_THREAD;
-        }
-        if (ts->rx_thread && (!(ts->signal_sent & ISCSI_SIGNAL_RX_THREAD))) {
-                send_sig(SIGINT, ts->rx_thread, 1);
-                ts->signal_sent |= ISCSI_SIGNAL_RX_THREAD;
-        }
-        spin_unlock_bh(&ts->ts_state_lock);
-
-        return 0;
-}
-
-static void iscsi_check_to_add_additional_sets(void)
-{
-        int thread_sets_add;
-
-        spin_lock(&inactive_ts_lock);
-        thread_sets_add = iscsit_global->inactive_ts;
-        spin_unlock(&inactive_ts_lock);
-        if (thread_sets_add == 1)
-                iscsi_allocate_thread_sets(1);
-}
-
-static int iscsi_signal_thread_pre_handler(struct iscsi_thread_set *ts)
-{
-        spin_lock_bh(&ts->ts_state_lock);
-        if (ts->status == ISCSI_THREAD_SET_DIE || kthread_should_stop() ||
-            signal_pending(current)) {
-                spin_unlock_bh(&ts->ts_state_lock);
-                return -1;
-        }
-        spin_unlock_bh(&ts->ts_state_lock);
-
-        return 0;
-}
-
-struct iscsi_conn *iscsi_rx_thread_pre_handler(struct iscsi_thread_set *ts)
-{
-        int ret;
-
-        spin_lock_bh(&ts->ts_state_lock);
-        if (ts->create_threads) {
-                spin_unlock_bh(&ts->ts_state_lock);
-                goto sleep;
-        }
-
-        if (ts->status != ISCSI_THREAD_SET_DIE)
-                flush_signals(current);
-
-        if (ts->delay_inactive && (--ts->thread_count == 0)) {
-                spin_unlock_bh(&ts->ts_state_lock);
-
-                if (!iscsit_global->in_shutdown)
-                        iscsi_deallocate_extra_thread_sets();
-
-                iscsi_add_ts_to_inactive_list(ts);
-                spin_lock_bh(&ts->ts_state_lock);
-        }
-
-        if ((ts->status == ISCSI_THREAD_SET_RESET) &&
-            (ts->thread_clear & ISCSI_CLEAR_RX_THREAD))
-                complete(&ts->rx_restart_comp);
-
-        ts->thread_clear &= ~ISCSI_CLEAR_RX_THREAD;
-        spin_unlock_bh(&ts->ts_state_lock);
-sleep:
-        ret = wait_for_completion_interruptible(&ts->rx_start_comp);
-        if (ret != 0)
-                return NULL;
-
-        if (iscsi_signal_thread_pre_handler(ts) < 0)
-                return NULL;
-
-        iscsi_check_to_add_additional_sets();
-
-        spin_lock_bh(&ts->ts_state_lock);
-        if (!ts->conn) {
-                pr_err("struct iscsi_thread_set->conn is NULL for"
-                        " RX thread_id: %s/%d\n", current->comm, current->pid);
-                spin_unlock_bh(&ts->ts_state_lock);
-                return NULL;
-        }
-        ts->thread_clear |= ISCSI_CLEAR_RX_THREAD;
-        spin_unlock_bh(&ts->ts_state_lock);
-
-        up(&ts->ts_activate_sem);
-
-        return ts->conn;
-}
-
-struct iscsi_conn *iscsi_tx_thread_pre_handler(struct iscsi_thread_set *ts)
-{
-        int ret;
-
-        spin_lock_bh(&ts->ts_state_lock);
-        if (ts->create_threads) {
-                spin_unlock_bh(&ts->ts_state_lock);
-                goto sleep;
-        }
-
-        if (ts->status != ISCSI_THREAD_SET_DIE)
-                flush_signals(current);
-
-        if (ts->delay_inactive && (--ts->thread_count == 0)) {
-                spin_unlock_bh(&ts->ts_state_lock);
-
-                if (!iscsit_global->in_shutdown)
-                        iscsi_deallocate_extra_thread_sets();
-
-                iscsi_add_ts_to_inactive_list(ts);
-                spin_lock_bh(&ts->ts_state_lock);
-        }
-        if ((ts->status == ISCSI_THREAD_SET_RESET) &&
-            (ts->thread_clear & ISCSI_CLEAR_TX_THREAD))
-                complete(&ts->tx_restart_comp);
-
-        ts->thread_clear &= ~ISCSI_CLEAR_TX_THREAD;
-        spin_unlock_bh(&ts->ts_state_lock);
-sleep:
-        ret = wait_for_completion_interruptible(&ts->tx_start_comp);
-        if (ret != 0)
-                return NULL;
-
-        if (iscsi_signal_thread_pre_handler(ts) < 0)
-                return NULL;
-
-        iscsi_check_to_add_additional_sets();
-
-        spin_lock_bh(&ts->ts_state_lock);
-        if (!ts->conn) {
-                pr_err("struct iscsi_thread_set->conn is NULL for"
-                        " TX thread_id: %s/%d\n", current->comm, current->pid);
-                spin_unlock_bh(&ts->ts_state_lock);
-                return NULL;
-        }
-        ts->thread_clear |= ISCSI_CLEAR_TX_THREAD;
-        spin_unlock_bh(&ts->ts_state_lock);
-
-        up(&ts->ts_activate_sem);
-
-        return ts->conn;
-}
-
-int iscsi_thread_set_init(void)
-{
-        int size;
-
-        iscsit_global->ts_bitmap_count = ISCSI_TS_BITMAP_BITS;
-
-        size = BITS_TO_LONGS(iscsit_global->ts_bitmap_count) * sizeof(long);
-        iscsit_global->ts_bitmap = kzalloc(size, GFP_KERNEL);
-        if (!iscsit_global->ts_bitmap) {
-                pr_err("Unable to allocate iscsit_global->ts_bitmap\n");
-                return -ENOMEM;
-        }
-
-        return 0;
-}
-
-void iscsi_thread_set_free(void)
-{
-        kfree(iscsit_global->ts_bitmap);
-}
diff --git a/drivers/target/iscsi/iscsi_target_tq.h b/drivers/target/iscsi/iscsi_target_tq.h
deleted file mode 100644
index cc1eede5ab3a..000000000000
--- a/drivers/target/iscsi/iscsi_target_tq.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#ifndef ISCSI_THREAD_QUEUE_H
-#define ISCSI_THREAD_QUEUE_H
-
-/*
- * Defines for thread sets.
- */
-extern int iscsi_thread_set_force_reinstatement(struct iscsi_conn *);
-extern int iscsi_allocate_thread_sets(u32);
-extern void iscsi_deallocate_thread_sets(void);
-extern void iscsi_activate_thread_set(struct iscsi_conn *, struct iscsi_thread_set *);
-extern struct iscsi_thread_set *iscsi_get_thread_set(void);
-extern void iscsi_set_thread_clear(struct iscsi_conn *, u8);
-extern void iscsi_set_thread_set_signal(struct iscsi_conn *, u8);
-extern int iscsi_release_thread_set(struct iscsi_conn *);
-extern struct iscsi_conn *iscsi_rx_thread_pre_handler(struct iscsi_thread_set *);
-extern struct iscsi_conn *iscsi_tx_thread_pre_handler(struct iscsi_thread_set *);
-extern int iscsi_thread_set_init(void);
-extern void iscsi_thread_set_free(void);
-
-extern int iscsi_target_tx_thread(void *);
-extern int iscsi_target_rx_thread(void *);
-
-#define TARGET_THREAD_SET_COUNT                 4
-
-#define ISCSI_RX_THREAD                         1
-#define ISCSI_TX_THREAD                         2
-#define ISCSI_RX_THREAD_NAME                    "iscsi_trx"
-#define ISCSI_TX_THREAD_NAME                    "iscsi_ttx"
-#define ISCSI_BLOCK_RX_THREAD                   0x1
-#define ISCSI_BLOCK_TX_THREAD                   0x2
-#define ISCSI_CLEAR_RX_THREAD                   0x1
-#define ISCSI_CLEAR_TX_THREAD                   0x2
-#define ISCSI_SIGNAL_RX_THREAD                  0x1
-#define ISCSI_SIGNAL_TX_THREAD                  0x2
-
-/* struct iscsi_thread_set->status */
-#define ISCSI_THREAD_SET_FREE                   1
-#define ISCSI_THREAD_SET_ACTIVE                 2
-#define ISCSI_THREAD_SET_DIE                    3
-#define ISCSI_THREAD_SET_RESET                  4
-#define ISCSI_THREAD_SET_DEALLOCATE_THREADS     5
-
-/* By default allow a maximum of 32K iSCSI connections */
-#define ISCSI_TS_BITMAP_BITS                    32768
-
-struct iscsi_thread_set {
-        /* flags used for blocking and restarting sets */
-        int     blocked_threads;
-        /* flag for creating threads */
-        int     create_threads;
-        /* flag for delaying readding to inactive list */
-        int     delay_inactive;
-        /* status for thread set */
-        int     status;
-        /* which threads have had signals sent */
-        int     signal_sent;
-        /* flag for which threads exited first */
-        int     thread_clear;
-        /* Active threads in the thread set */
-        int     thread_count;
-        /* Unique thread ID */
-        u32     thread_id;
-        /* pointer to connection if set is active */
-        struct iscsi_conn       *conn;
-        /* used for controlling ts state accesses */
-        spinlock_t      ts_state_lock;
-        /* used for restarting thread queue */
-        struct completion       rx_restart_comp;
-        /* used for restarting thread queue */
-        struct completion       tx_restart_comp;
-        /* used for normal unused blocking */
-        struct completion       rx_start_comp;
-        /* used for normal unused blocking */
-        struct completion       tx_start_comp;
-        /* OS descriptor for rx thread */
-        struct task_struct      *rx_thread;
-        /* OS descriptor for tx thread */
-        struct task_struct      *tx_thread;
-        /* struct iscsi_thread_set in list list head*/
-        struct list_head        ts_list;
-        struct semaphore        ts_activate_sem;
-};
-
-#endif   /*** ISCSI_THREAD_QUEUE_H ***/
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
index 390df8ed72b2..b18edda3e8af 100644
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@ -33,7 +33,6 @@
 #include "iscsi_target_erl1.h"
 #include "iscsi_target_erl2.h"
 #include "iscsi_target_tpg.h"
-#include "iscsi_target_tq.h"
 #include "iscsi_target_util.h"
 #include "iscsi_target.h"