Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77271de6 authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

Documentation/target: Fix tcm_mod_builder.py build breakage 



This patch fixes TFO->release_cmd() and removes legacy pack_lun() usage
and new_cmd_failure when generating new TCM fabric skeleton from the
tcm_mod_builder.py script.

Reported-by: default avatarStefan Bergstrand <stefan.bergstrand@sdsab.se>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent e0a53e70

Documentation/target/tcm_mod_builder.py

+2 −21
Original line number Diff line number Diff line
@@ -386,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"
@@ -400,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"
@@ -806,7 +803,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"
@@ -890,13 +887,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"
@@ -939,15 +929,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: