1 files changed, 9 insertions, 9 deletions

diff --git a/Documentation/target/tcm_mod_builder.py b/Documentation/target/tcm_mod_builder.py
index dbeb8a0d717..7ef9b843d52 100755
--- a/Documentation/target/tcm_mod_builder.py
+++ b/Documentation/target/tcm_mod_builder.py
@@ -239,8 +239,8 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
         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"
+        buf += "#include \"" + fabric_mod_name + "_base.h\"\n"
+        buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n"
 
         buf += "/* Local pointer to allocated TCM configfs fabric module */\n"
         buf += "struct target_fabric_configfs *" + fabric_mod_name + "_fabric_configfs;\n\n"
@@ -289,6 +289,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
         buf += "{\n"
         buf += "        struct " + fabric_mod_name + "_nacl *nacl = container_of(se_acl,\n"
         buf += "                                struct " + fabric_mod_name + "_nacl, se_node_acl);\n"
+        buf += "        core_tpg_del_initiator_node_acl(se_acl->se_tpg, se_acl, 1);\n"
         buf += "        kfree(nacl);\n"
         buf += "}\n\n"
 
@@ -583,9 +584,9 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
         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 <" + fabric_mod_name + "_base.h>\n"
-        buf += "#include <" + fabric_mod_name + "_fabric.h>\n\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"
 
         buf += "int " + fabric_mod_name + "_check_true(struct se_portal_group *se_tpg)\n"
         buf += "{\n"
@@ -973,14 +974,13 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
 def tcm_mod_build_kbuild(fabric_mod_dir_var, fabric_mod_name):
 
         buf = ""
-        f = fabric_mod_dir_var + "/Kbuild"
+        f = fabric_mod_dir_var + "/Makefile"
         print "Writing file: " + f
 
         p = open(f, 'w')
         if not p:
                 tcm_mod_err("Unable to open file: " + f)
 
-        buf = "EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/include/ -I$(srctree)/drivers/scsi/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/" + fabric_mod_name + "\n\n"
         buf += fabric_mod_name + "-objs                 := " + fabric_mod_name + "_fabric.o \\\n"
         buf += "                                           " + fabric_mod_name + "_configfs.o\n"
         buf += "obj-$(CONFIG_" + fabric_mod_name.upper() + ")           += " + fabric_mod_name + ".o\n"
@@ -1018,7 +1018,7 @@ def tcm_mod_build_kconfig(fabric_mod_dir_var, fabric_mod_name):
 
 def tcm_mod_add_kbuild(tcm_dir, fabric_mod_name):
         buf = "obj-$(CONFIG_" + fabric_mod_name.upper() + ")    += " + fabric_mod_name.lower() + "/\n"
-        kbuild = tcm_dir + "/drivers/target/Kbuild"
+        kbuild = tcm_dir + "/drivers/target/Makefile"
 
         f = open(kbuild, 'a')
         f.write(buf)
@@ -1064,7 +1064,7 @@ def main(modname, proto_ident):
         tcm_mod_build_kbuild(fabric_mod_dir, fabric_mod_name)
         tcm_mod_build_kconfig(fabric_mod_dir, fabric_mod_name)
 
-        input = raw_input("Would you like to add " + fabric_mod_name + "to drivers/target/Kbuild..? [yes,no]: ")
+        input = raw_input("Would you like to add " + fabric_mod_name + "to drivers/target/Makefile..? [yes,no]: ")
         if input == "yes" or input == "y":
                 tcm_mod_add_kbuild(tcm_dir, fabric_mod_name)