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

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (26 commits)
  target: Set additional sense length field in sense data
  target: Remove legacy device status check from transport_execute_tasks
  target: Remove __transport_execute_tasks() for each processing context
  target: Remove extra se_device->execute_task_lock access in fast path
  target: Drop se_device TCQ queue_depth usage from I/O path
  target: Fix possible NULL pointer with __transport_execute_tasks
  target: Remove TFO->check_release_cmd() fabric API caller
  tcm_fc: Convert ft_send_work to use target_submit_cmd
  target: Add target_submit_cmd() for process context fabric submission
  target: Make target_put_sess_cmd use target_release_cmd_kref
  target: Set response format in INQUIRY response
  target: tcm_mod_builder: small fixups
  Documentation/target: Fix tcm_mod_builder.py build breakage
  target: remove overagressive ____cacheline_aligned annoations
  tcm_loop: bump max_sectors
  target/configs: remove trailing newline from udev_path and alias
  iscsi-target: fix chap identifier simple_strtoul usage
  target: remove useless casts
  target: simplify target_check_cdb_and_preempt
  target: Move core_scsi3_check_cdb_abort_and_preempt
  ...

1 files changed, 15 insertions, 45 deletions

diff --git a/Documentation/target/tcm_mod_builder.py b/Documentation/target/tcm_mod_builder.py
index 7ef9b843d529..6e21b8b52638 100755
--- a/Documentation/target/tcm_mod_builder.py
+++ b/Documentation/target/tcm_mod_builder.py
@@ -230,14 +230,9 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
         buf += "#include <linux/ctype.h>\n"
         buf += "#include <asm/unaligned.h>\n\n"
         buf += "#include <target/target_core_base.h>\n"
-        buf += "#include <target/target_core_transport.h>\n"
-        buf += "#include <target/target_core_fabric_ops.h>\n"
+        buf += "#include <target/target_core_fabric.h>\n"
         buf += "#include <target/target_core_fabric_configfs.h>\n"
-        buf += "#include <target/target_core_fabric_lib.h>\n"
-        buf += "#include <target/target_core_device.h>\n"
-        buf += "#include <target/target_core_tpg.h>\n"
         buf += "#include <target/target_core_configfs.h>\n"
-        buf += "#include <target/target_core_base.h>\n"
         buf += "#include <target/configfs_macros.h>\n\n"
         buf += "#include \"" + fabric_mod_name + "_base.h\"\n"
         buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n"
@@ -260,7 +255,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
         buf += "        /* " + fabric_mod_name + "_parse_wwn(name, &wwpn, 1) < 0)\n"
         buf += "                return ERR_PTR(-EINVAL); */\n"
         buf += "        se_nacl_new = " + fabric_mod_name + "_alloc_fabric_acl(se_tpg);\n"
-        buf += "        if (!(se_nacl_new))\n"
+        buf += "        if (!se_nacl_new)\n"
         buf += "                return ERR_PTR(-ENOMEM);\n"
         buf += "//#warning FIXME: Hardcoded nexus depth in " + fabric_mod_name + "_make_nodeacl()\n"
         buf += "        nexus_depth = 1;\n"
@@ -308,7 +303,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
         buf += "        if (strict_strtoul(name + 5, 10, &tpgt) || tpgt > UINT_MAX)\n"
         buf += "                return ERR_PTR(-EINVAL);\n\n"
         buf += "        tpg = kzalloc(sizeof(struct " + fabric_mod_name + "_tpg), GFP_KERNEL);\n"
-        buf += "        if (!(tpg)) {\n"
+        buf += "        if (!tpg) {\n"
         buf += "                printk(KERN_ERR \"Unable to allocate struct " + fabric_mod_name + "_tpg\");\n"
         buf += "                return ERR_PTR(-ENOMEM);\n"
         buf += "        }\n"
@@ -344,7 +339,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
         buf += "        /* if (" + fabric_mod_name + "_parse_wwn(name, &wwpn, 1) < 0)\n"
         buf += "                return ERR_PTR(-EINVAL); */\n\n"
         buf += "        " + fabric_mod_port + " = kzalloc(sizeof(struct " + fabric_mod_name + "_" + fabric_mod_port + "), GFP_KERNEL);\n"
-        buf += "        if (!(" + fabric_mod_port + ")) {\n"
+        buf += "        if (!" + fabric_mod_port + ") {\n"
         buf += "                printk(KERN_ERR \"Unable to allocate struct " + fabric_mod_name + "_" + fabric_mod_port + "\");\n"
         buf += "                return ERR_PTR(-ENOMEM);\n"
         buf += "        }\n"
@@ -352,7 +347,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
         if proto_ident == "FC" or proto_ident == "SAS":
                 buf += "        " + fabric_mod_port + "->" + fabric_mod_port + "_wwpn = wwpn;\n"
 
-        buf += "        /* " + fabric_mod_name + "_format_wwn(&" + fabric_mod_port + "->" + fabric_mod_port + "_name[0], " + fabric_mod_name.upper() + "__NAMELEN, wwpn); */\n\n"
+        buf += "        /* " + fabric_mod_name + "_format_wwn(&" + fabric_mod_port + "->" + fabric_mod_port + "_name[0], " + fabric_mod_name.upper() + "_NAMELEN, wwpn); */\n\n"
         buf += "        return &" + fabric_mod_port + "->" + fabric_mod_port + "_wwn;\n"
         buf += "}\n\n"
         buf += "static void " + fabric_mod_name + "_drop_" + fabric_mod_port + "(struct se_wwn *wwn)\n"
@@ -391,8 +386,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
         buf += "        .tpg_alloc_fabric_acl           = " + fabric_mod_name + "_alloc_fabric_acl,\n"
         buf += "        .tpg_release_fabric_acl         = " + fabric_mod_name + "_release_fabric_acl,\n"
         buf += "        .tpg_get_inst_index             = " + fabric_mod_name + "_tpg_get_inst_index,\n"
-        buf += "        .release_cmd_to_pool            = " + fabric_mod_name + "_release_cmd,\n"
-        buf += "        .release_cmd_direct             = " + fabric_mod_name + "_release_cmd,\n"
+        buf += "        .release_cmd                    = " + fabric_mod_name + "_release_cmd,\n"
         buf += "        .shutdown_session               = " + fabric_mod_name + "_shutdown_session,\n"
         buf += "        .close_session                  = " + fabric_mod_name + "_close_session,\n"
         buf += "        .stop_session                   = " + fabric_mod_name + "_stop_session,\n"
@@ -405,14 +399,12 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
         buf += "        .set_default_node_attributes    = " + fabric_mod_name + "_set_default_node_attrs,\n"
         buf += "        .get_task_tag                   = " + fabric_mod_name + "_get_task_tag,\n"
         buf += "        .get_cmd_state                  = " + fabric_mod_name + "_get_cmd_state,\n"
-        buf += "        .new_cmd_failure                = " + fabric_mod_name + "_new_cmd_failure,\n"
         buf += "        .queue_data_in                  = " + fabric_mod_name + "_queue_data_in,\n"
         buf += "        .queue_status                   = " + fabric_mod_name + "_queue_status,\n"
         buf += "        .queue_tm_rsp                   = " + fabric_mod_name + "_queue_tm_rsp,\n"
         buf += "        .get_fabric_sense_len           = " + fabric_mod_name + "_get_fabric_sense_len,\n"
         buf += "        .set_fabric_sense_len           = " + fabric_mod_name + "_set_fabric_sense_len,\n"
         buf += "        .is_state_remove                = " + fabric_mod_name + "_is_state_remove,\n"
-        buf += "        .pack_lun                       = " + fabric_mod_name + "_pack_lun,\n"
         buf += "        /*\n"
         buf += "         * Setup function pointers for generic logic in target_core_fabric_configfs.c\n"
         buf += "         */\n"
@@ -439,9 +431,9 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
         buf += "         * Register the top level struct config_item_type with TCM core\n"
         buf += "         */\n"
         buf += "        fabric = target_fabric_configfs_init(THIS_MODULE, \"" + fabric_mod_name[4:] + "\");\n"
-        buf += "        if (!(fabric)) {\n"
+        buf += "        if (IS_ERR(fabric)) {\n"
         buf += "                printk(KERN_ERR \"target_fabric_configfs_init() failed\\n\");\n"
-        buf += "                return -ENOMEM;\n"
+        buf += "                return PTR_ERR(fabric);\n"
         buf += "        }\n"
         buf += "        /*\n"
         buf += "         * Setup fabric->tf_ops from our local " + fabric_mod_name + "_ops\n"
@@ -475,9 +467,9 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
         buf += "        printk(KERN_INFO \"" +  fabric_mod_name.upper() + "[0] - Set fabric -> " + fabric_mod_name + "_fabric_configfs\\n\");\n"
         buf += "        return 0;\n"
         buf += "};\n\n"
-        buf += "static void " + fabric_mod_name + "_deregister_configfs(void)\n"
+        buf += "static void __exit " + fabric_mod_name + "_deregister_configfs(void)\n"
         buf += "{\n"
-        buf += "        if (!(" + fabric_mod_name + "_fabric_configfs))\n"
+        buf += "        if (!" + fabric_mod_name + "_fabric_configfs)\n"
         buf += "                return;\n\n"
         buf += "        target_fabric_configfs_deregister(" + fabric_mod_name + "_fabric_configfs);\n"
         buf += "        " + fabric_mod_name + "_fabric_configfs = NULL;\n"
@@ -492,17 +484,15 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
         buf += "                return ret;\n\n"
         buf += "        return 0;\n"
         buf += "};\n\n"
-        buf += "static void " + fabric_mod_name + "_exit(void)\n"
+        buf += "static void __exit " + fabric_mod_name + "_exit(void)\n"
         buf += "{\n"
         buf += "        " + fabric_mod_name + "_deregister_configfs();\n"
         buf += "};\n\n"
 
-        buf += "#ifdef MODULE\n"
         buf += "MODULE_DESCRIPTION(\"" + fabric_mod_name.upper() + " series fabric driver\");\n"
         buf += "MODULE_LICENSE(\"GPL\");\n"
         buf += "module_init(" + fabric_mod_name + "_init);\n"
         buf += "module_exit(" + fabric_mod_name + "_exit);\n"
-        buf += "#endif\n"
 
         ret = p.write(buf)
         if ret:
@@ -514,7 +504,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
 
 def tcm_mod_scan_fabric_ops(tcm_dir):
 
-        fabric_ops_api = tcm_dir + "include/target/target_core_fabric_ops.h"
+        fabric_ops_api = tcm_dir + "include/target/target_core_fabric.h"
 
         print "Using tcm_mod_scan_fabric_ops: " + fabric_ops_api
         process_fo = 0;
@@ -579,11 +569,7 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
         buf += "#include <scsi/scsi_cmnd.h>\n"
         buf += "#include <scsi/libfc.h>\n\n"
         buf += "#include <target/target_core_base.h>\n"
-        buf += "#include <target/target_core_transport.h>\n"
-        buf += "#include <target/target_core_fabric_ops.h>\n"
-        buf += "#include <target/target_core_fabric_lib.h>\n"
-        buf += "#include <target/target_core_device.h>\n"
-        buf += "#include <target/target_core_tpg.h>\n"
+        buf += "#include <target/target_core_fabric.h>\n"
         buf += "#include <target/target_core_configfs.h>\n\n"
         buf += "#include \"" + fabric_mod_name + "_base.h\"\n"
         buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n"
@@ -788,7 +774,7 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
                         buf += "{\n"
                         buf += "        struct " + fabric_mod_name + "_nacl *nacl;\n\n"
                         buf += "        nacl = kzalloc(sizeof(struct " + fabric_mod_name + "_nacl), GFP_KERNEL);\n"
-                        buf += "        if (!(nacl)) {\n"
+                        buf += "        if (!nacl) {\n"
                         buf += "                printk(KERN_ERR \"Unable to alocate struct " + fabric_mod_name + "_nacl\\n\");\n"
                         buf += "                return NULL;\n"
                         buf += "        }\n\n"
@@ -815,7 +801,7 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
                         buf += "}\n\n"
                         bufi += "u32 " + fabric_mod_name + "_tpg_get_inst_index(struct se_portal_group *);\n"
 
-                if re.search('release_cmd_to_pool', fo):
+                if re.search('\*release_cmd\)\(', fo):
                         buf += "void " + fabric_mod_name + "_release_cmd(struct se_cmd *se_cmd)\n"
                         buf += "{\n"
                         buf += "        return;\n"
@@ -899,13 +885,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
                         buf += "}\n\n"
                         bufi += "int " + fabric_mod_name + "_get_cmd_state(struct se_cmd *);\n"
 
-                if re.search('new_cmd_failure\)\(', fo):
-                        buf += "void " + fabric_mod_name + "_new_cmd_failure(struct se_cmd *se_cmd)\n"
-                        buf += "{\n"
-                        buf += "        return;\n"
-                        buf += "}\n\n"
-                        bufi += "void " + fabric_mod_name + "_new_cmd_failure(struct se_cmd *);\n"
-
                 if re.search('queue_data_in\)\(', fo):
                         buf += "int " + fabric_mod_name + "_queue_data_in(struct se_cmd *se_cmd)\n"
                         buf += "{\n"
@@ -948,15 +927,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
                         buf += "}\n\n"
                         bufi += "int " + fabric_mod_name + "_is_state_remove(struct se_cmd *);\n"
 
-                if re.search('pack_lun\)\(', fo):
-                        buf += "u64 " + fabric_mod_name + "_pack_lun(unsigned int lun)\n"
-                        buf += "{\n"
-                        buf += "        WARN_ON(lun >= 256);\n"
-                        buf += "        /* Caller wants this byte-swapped */\n"
-                        buf += "        return cpu_to_le64((lun & 0xff) << 8);\n"
-                        buf += "}\n\n"
-                        bufi += "u64 " + fabric_mod_name + "_pack_lun(unsigned int);\n"
-
 
         ret = p.write(buf)
         if ret: