diff options
author | Christoph Hellwig <hch@lst.de> | 2015-05-01 11:47:57 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2015-05-31 01:42:30 -0400 |
commit | 2aeeafae6bb9f04dbe17b521bcd8f0d03516c393 (patch) | |
tree | e4efb82f007a4afe684702c5983195e2403250e2 /Documentation/target/tcm_mod_builder.py | |
parent | e4aae5af810eaa61c2cd7ba79d95ebfe0d88fe9b (diff) |
target: remove the get_fabric_proto_ident method
Now that we store the protocol identifier in the tpg structure we don't
need this method.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'Documentation/target/tcm_mod_builder.py')
-rwxr-xr-x | Documentation/target/tcm_mod_builder.py | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/Documentation/target/tcm_mod_builder.py b/Documentation/target/tcm_mod_builder.py index b04846e985d4..29176c29537c 100755 --- a/Documentation/target/tcm_mod_builder.py +++ b/Documentation/target/tcm_mod_builder.py | |||
@@ -300,9 +300,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): | |||
300 | buf += "static const struct target_core_fabric_ops " + fabric_mod_name + "_ops = {\n" | 300 | buf += "static const struct target_core_fabric_ops " + fabric_mod_name + "_ops = {\n" |
301 | buf += " .module = THIS_MODULE,\n" | 301 | buf += " .module = THIS_MODULE,\n" |
302 | buf += " .name = " + fabric_mod_name + ",\n" | 302 | buf += " .name = " + fabric_mod_name + ",\n" |
303 | buf += " .get_fabric_proto_ident = " + fabric_mod_name + "_get_fabric_proto_ident,\n" | ||
304 | buf += " .get_fabric_name = " + fabric_mod_name + "_get_fabric_name,\n" | 303 | buf += " .get_fabric_name = " + fabric_mod_name + "_get_fabric_name,\n" |
305 | buf += " .get_fabric_proto_ident = " + fabric_mod_name + "_get_fabric_proto_ident,\n" | ||
306 | buf += " .tpg_get_wwn = " + fabric_mod_name + "_get_fabric_wwn,\n" | 304 | buf += " .tpg_get_wwn = " + fabric_mod_name + "_get_fabric_wwn,\n" |
307 | buf += " .tpg_get_tag = " + fabric_mod_name + "_get_tag,\n" | 305 | buf += " .tpg_get_tag = " + fabric_mod_name + "_get_tag,\n" |
308 | buf += " .tpg_get_pr_transport_id = " + fabric_mod_name + "_get_pr_transport_id,\n" | 306 | buf += " .tpg_get_pr_transport_id = " + fabric_mod_name + "_get_pr_transport_id,\n" |
@@ -461,35 +459,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): | |||
461 | bufi += "char *" + fabric_mod_name + "_get_fabric_name(void);\n" | 459 | bufi += "char *" + fabric_mod_name + "_get_fabric_name(void);\n" |
462 | continue | 460 | continue |
463 | 461 | ||
464 | if re.search('get_fabric_proto_ident', fo): | ||
465 | buf += "u8 " + fabric_mod_name + "_get_fabric_proto_ident(struct se_portal_group *se_tpg)\n" | ||
466 | buf += "{\n" | ||
467 | buf += " struct " + fabric_mod_name + "_tpg *tpg = container_of(se_tpg,\n" | ||
468 | buf += " struct " + fabric_mod_name + "_tpg, se_tpg);\n" | ||
469 | buf += " struct " + fabric_mod_name + "_" + fabric_mod_port + " *" + fabric_mod_port + " = tpg->" + fabric_mod_port + ";\n" | ||
470 | buf += " u8 proto_id;\n\n" | ||
471 | buf += " switch (" + fabric_mod_port + "->" + fabric_mod_port + "_proto_id) {\n" | ||
472 | if proto_ident == "FC": | ||
473 | buf += " case SCSI_PROTOCOL_FCP:\n" | ||
474 | buf += " default:\n" | ||
475 | buf += " proto_id = fc_get_fabric_proto_ident(se_tpg);\n" | ||
476 | buf += " break;\n" | ||
477 | elif proto_ident == "SAS": | ||
478 | buf += " case SCSI_PROTOCOL_SAS:\n" | ||
479 | buf += " default:\n" | ||
480 | buf += " proto_id = sas_get_fabric_proto_ident(se_tpg);\n" | ||
481 | buf += " break;\n" | ||
482 | elif proto_ident == "iSCSI": | ||
483 | buf += " case SCSI_PROTOCOL_ISCSI:\n" | ||
484 | buf += " default:\n" | ||
485 | buf += " proto_id = iscsi_get_fabric_proto_ident(se_tpg);\n" | ||
486 | buf += " break;\n" | ||
487 | |||
488 | buf += " }\n\n" | ||
489 | buf += " return proto_id;\n" | ||
490 | buf += "}\n\n" | ||
491 | bufi += "u8 " + fabric_mod_name + "_get_fabric_proto_ident(struct se_portal_group *);\n" | ||
492 | |||
493 | if re.search('get_wwn', fo): | 462 | if re.search('get_wwn', fo): |
494 | buf += "char *" + fabric_mod_name + "_get_fabric_wwn(struct se_portal_group *se_tpg)\n" | 463 | buf += "char *" + fabric_mod_name + "_get_fabric_wwn(struct se_portal_group *se_tpg)\n" |
495 | buf += "{\n" | 464 | buf += "{\n" |