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
  ...

2 files changed, 24 insertions, 66 deletions

diff --git a/drivers/target/tcm_fc/tcm_fc.h b/drivers/target/tcm_fc/tcm_fc.h
index a0bcfd3e7e7d..881deb3d499a 100644
--- a/drivers/target/tcm_fc/tcm_fc.h
+++ b/drivers/target/tcm_fc/tcm_fc.h
@@ -129,7 +129,6 @@ struct ft_cmd {
 
 extern struct mutex ft_lport_lock;
 extern struct fc4_prov ft_prov;
-extern struct target_fabric_configfs *ft_configfs;
 extern unsigned int ft_debug_logging;
 
 /*
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index efdcb9663a1a..65dce1345966 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -48,7 +48,7 @@
 
 #include "tcm_fc.h"
 
-struct target_fabric_configfs *ft_configfs;
+static const struct target_core_fabric_ops ft_fabric_ops;
 
 static LIST_HEAD(ft_wwn_list);
 DEFINE_MUTEX(ft_lport_lock);
@@ -337,7 +337,7 @@ static struct se_portal_group *ft_add_tpg(
                 return NULL;
         }
 
-        ret = core_tpg_register(&ft_configfs->tf_ops, wwn, &tpg->se_tpg,
+        ret = core_tpg_register(&ft_fabric_ops, wwn, &tpg->se_tpg,
                                 tpg, TRANSPORT_TPG_TYPE_NORMAL);
         if (ret < 0) {
                 destroy_workqueue(wq);
@@ -507,7 +507,9 @@ static u32 ft_tpg_get_inst_index(struct se_portal_group *se_tpg)
         return tpg->index;
 }
 
-static struct target_core_fabric_ops ft_fabric_ops = {
+static const struct target_core_fabric_ops ft_fabric_ops = {
+        .module =                       THIS_MODULE,
+        .name =                         "fc",
         .get_fabric_name =              ft_get_fabric_name,
         .get_fabric_proto_ident =       fc_get_fabric_proto_ident,
         .tpg_get_wwn =                  ft_get_fabric_wwn,
@@ -552,62 +554,10 @@ static struct target_core_fabric_ops ft_fabric_ops = {
         .fabric_drop_np =               NULL,
         .fabric_make_nodeacl =          &ft_add_acl,
         .fabric_drop_nodeacl =          &ft_del_acl,
-};
-
-static int ft_register_configfs(void)
-{
-        struct target_fabric_configfs *fabric;
-        int ret;
-
-        /*
-         * Register the top level struct config_item_type with TCM core
-         */
-        fabric = target_fabric_configfs_init(THIS_MODULE, "fc");
-        if (IS_ERR(fabric)) {
-                pr_err("%s: target_fabric_configfs_init() failed!\n",
-                       __func__);
-                return PTR_ERR(fabric);
-        }
-        fabric->tf_ops = ft_fabric_ops;
-
-        /*
-         * Setup default attribute lists for various fabric->tf_cit_tmpl
-         */
-        fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = ft_wwn_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs =
-                                                    ft_nacl_base_attrs;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
-        fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;
-        /*
-         * register the fabric for use within TCM
-         */
-        ret = target_fabric_configfs_register(fabric);
-        if (ret < 0) {
-                pr_debug("target_fabric_configfs_register() for"
-                            " FC Target failed!\n");
-                target_fabric_configfs_free(fabric);
-                return -1;
-        }
-
-        /*
-         * Setup our local pointer to *fabric.
-         */
-        ft_configfs = fabric;
-        return 0;
-}
 
-static void ft_deregister_configfs(void)
-{
-        if (!ft_configfs)
-                return;
-        target_fabric_configfs_deregister(ft_configfs);
-        ft_configfs = NULL;
-}
+        .tfc_wwn_attrs                  = ft_wwn_attrs,
+        .tfc_tpg_nacl_base_attrs        = ft_nacl_base_attrs,
+};
 
 static struct notifier_block ft_notifier = {
         .notifier_call = ft_lport_notify
@@ -615,15 +565,24 @@ static struct notifier_block ft_notifier = {
 
 static int __init ft_init(void)
 {
-        if (ft_register_configfs())
-                return -1;
-        if (fc_fc4_register_provider(FC_TYPE_FCP, &ft_prov)) {
-                ft_deregister_configfs();
-                return -1;
-        }
+        int ret;
+
+        ret = target_register_template(&ft_fabric_ops);
+        if (ret)
+                goto out;
+
+        ret = fc_fc4_register_provider(FC_TYPE_FCP, &ft_prov);
+        if (ret)
+                goto out_unregister_template;
+
         blocking_notifier_chain_register(&fc_lport_notifier_head, &ft_notifier);
         fc_lport_iterate(ft_lport_add, NULL);
         return 0;
+
+out_unregister_template:
+        target_unregister_template(&ft_fabric_ops);
+out:
+        return ret;
 }
 
 static void __exit ft_exit(void)
@@ -632,7 +591,7 @@ static void __exit ft_exit(void)
                                            &ft_notifier);
         fc_fc4_deregister_provider(FC_TYPE_FCP, &ft_prov);
         fc_lport_iterate(ft_lport_del, NULL);
-        ft_deregister_configfs();
+        target_unregister_template(&ft_fabric_ops);
         synchronize_rcu();
 }