scsi: target: drop unnecessary get_fabric_name() accessor from fabric_ops

All fabrics return a const string. In all cases *except* iSCSI the
get_fabric_name() string matches fabric_ops.name.

Both fabric_ops.get_fabric_name() and fabric_ops.name are user-facing, with
the former being used for PR/ALUA state and the latter for ConfigFS
(config/target/$name), so we unfortunately need to keep both strings around
for now.  Replace the useless .get_fabric_name() accessor function with a
const string fabric_name member variable.

Signed-off-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 62427acdf503..ae6c44c48f75 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -351,8 +351,8 @@ static int target_fabric_tf_ops_check(const struct target_core_fabric_ops *tfo)
                         "_NAME_SIZE\n", tfo->name);
                 return -EINVAL;
         }
-        if (!tfo->get_fabric_name) {
-                pr_err("Missing tfo->get_fabric_name()\n");
+        if (!tfo->fabric_name) {
+                pr_err("Missing tfo->fabric_name\n");
                 return -EINVAL;
         }
         if (!tfo->tpg_get_wwn) {
@@ -1403,7 +1403,7 @@ static ssize_t target_core_dev_pr_show_spc3_res(struct se_device *dev,
         core_pr_dump_initiator_port(pr_reg, i_buf, PR_REG_ISID_ID_LEN);
 
         return sprintf(page, "SPC-3 Reservation: %s Initiator: %s%s\n",
-                se_nacl->se_tpg->se_tpg_tfo->get_fabric_name(),
+                se_nacl->se_tpg->se_tpg_tfo->fabric_name,
                 se_nacl->initiatorname, i_buf);
 }
 
@@ -1417,7 +1417,7 @@ static ssize_t target_core_dev_pr_show_spc2_res(struct se_device *dev,
         if (se_nacl) {
                 len = sprintf(page,
                               "SPC-2 Reservation: %s Initiator: %s\n",
-                              se_nacl->se_tpg->se_tpg_tfo->get_fabric_name(),
+                              se_nacl->se_tpg->se_tpg_tfo->fabric_name,
                               se_nacl->initiatorname);
         } else {
                 len = sprintf(page, "No SPC-2 Reservation holder\n");
@@ -1495,13 +1495,13 @@ static ssize_t target_pr_res_pr_holder_tg_port_show(struct config_item *item,
         tfo = se_tpg->se_tpg_tfo;
 
         len += sprintf(page+len, "SPC-3 Reservation: %s"
-                " Target Node Endpoint: %s\n", tfo->get_fabric_name(),
+                " Target Node Endpoint: %s\n", tfo->fabric_name,
                 tfo->tpg_get_wwn(se_tpg));
         len += sprintf(page+len, "SPC-3 Reservation: Relative Port"
                 " Identifier Tag: %hu %s Portal Group Tag: %hu"
                 " %s Logical Unit: %llu\n", pr_reg->tg_pt_sep_rtpi,
-                tfo->get_fabric_name(), tfo->tpg_get_tag(se_tpg),
-                tfo->get_fabric_name(), pr_reg->pr_aptpl_target_lun);
+                tfo->fabric_name, tfo->tpg_get_tag(se_tpg),
+                tfo->fabric_name, pr_reg->pr_aptpl_target_lun);
 
 out_unlock:
         spin_unlock(&dev->dev_reservation_lock);
@@ -1532,7 +1532,7 @@ static ssize_t target_pr_res_pr_registered_i_pts_show(struct config_item *item,
                 core_pr_dump_initiator_port(pr_reg, i_buf,
                                         PR_REG_ISID_ID_LEN);
                 sprintf(buf, "%s Node: %s%s Key: 0x%016Lx PRgen: 0x%08x\n",
-                        tfo->get_fabric_name(),
+                        tfo->fabric_name,
                         pr_reg->pr_reg_nacl->initiatorname, i_buf, pr_reg->pr_res_key,
                         pr_reg->pr_res_generation);
 
@@ -2757,7 +2757,7 @@ static ssize_t target_tg_pt_gp_members_show(struct config_item *item,
                 struct se_portal_group *tpg = lun->lun_tpg;
 
                 cur_len = snprintf(buf, TG_PT_GROUP_NAME_BUF, "%s/%s/tpgt_%hu"
-                        "/%s\n", tpg->se_tpg_tfo->get_fabric_name(),
+                        "/%s\n", tpg->se_tpg_tfo->fabric_name,
                         tpg->se_tpg_tfo->tpg_get_wwn(tpg),
                         tpg->se_tpg_tfo->tpg_get_tag(tpg),
                         config_item_name(&lun->lun_group.cg_item));