scsi: target: Use config_item_name() instead of open-coding it

Some target code uses config_item_name() while other code accesses .ci_name
directly. Make the target code consistent by switching to
config_item_name().

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Mike Christie <mchristi@redhat.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 5ccef7d597fa34c95cf5ab5e821ce4e95e16c2b7..93d3ff34b61488f418ae2a3bdc371f5cac54b160 100644 (file)
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -263,8 +263,8 @@ static struct config_group *target_core_register_fabric(
                        &tf->tf_discovery_cit);
        configfs_add_default_group(&tf->tf_disc_group, &tf->tf_group);
 
-       pr_debug("Target_Core_ConfigFS: REGISTER -> Allocated Fabric:"
-                       " %s\n", tf->tf_group.cg_item.ci_name);
+       pr_debug("Target_Core_ConfigFS: REGISTER -> Allocated Fabric: %s\n",
+                config_item_name(&tf->tf_group.cg_item));
        return &tf->tf_group;
 }
 

diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c
index b054682e974f91c05fa4c640e314e69397646a93..ebac2b49b9c6e503173f5178d20907dd626820cf 100644 (file)
--- a/drivers/target/target_core_sbc.c
+++ b/drivers/target/target_core_sbc.c
@@ -978,9 +978,10 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops)
        }
        case COMPARE_AND_WRITE:
                if (!dev->dev_attrib.emulate_caw) {
-                       pr_err_ratelimited("se_device %s/%s (vpd_unit_serial %s) reject"
-                               " COMPARE_AND_WRITE\n", dev->se_hba->backend->ops->name,
-                               dev->dev_group.cg_item.ci_name, dev->t10_wwn.unit_serial);
+                       pr_err_ratelimited("se_device %s/%s (vpd_unit_serial %s) reject COMPARE_AND_WRITE\n",
+                                          dev->se_hba->backend->ops->name,
+                                          config_item_name(&dev->dev_group.cg_item),
+                                          dev->t10_wwn.unit_serial);
                        return TCM_UNSUPPORTED_SCSI_OPCODE;
                }
                sectors = cdb[13];