target: consolidate version defines

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 68addbc..6003921 100644 (file)
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -103,7 +103,7 @@ static ssize_t target_core_attr_show(struct config_item *item,
                                      char *page)
 {
        return sprintf(page, "Target Engine Core ConfigFS Infrastructure %s"
-               " on %s/%s on "UTS_RELEASE"\n", TARGET_CORE_CONFIGFS_VERSION,
+               " on %s/%s on "UTS_RELEASE"\n", TARGET_CORE_VERSION,
                utsname()->sysname, utsname()->machine);
 }
 
@@ -3235,7 +3235,7 @@ static ssize_t target_core_hba_show_attr_hba_info(
 {
        return sprintf(page, "HBA Index: %d plugin: %s version: %s\n",
                        hba->hba_id, hba->backend->ops->name,
-                       TARGET_CORE_CONFIGFS_VERSION);
+                       TARGET_CORE_VERSION);
 }
 
 SE_HBA_ATTR_RO(hba_info);
@@ -3507,7 +3507,7 @@ static int __init target_core_init_configfs(void)
                goto out_global;
        }
        pr_debug("TARGET_CORE[0]: Initialized ConfigFS Fabric"
-               " Infrastructure: "TARGET_CORE_CONFIGFS_VERSION" on %s/%s"
+               " Infrastructure: "TARGET_CORE_VERSION" on %s/%s"
                " on "UTS_RELEASE"\n", utsname()->sysname, utsname()->machine);
        /*
         * Register built-in RAMDISK subsystem logic for virtual LUN 0

diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index f5da2c1..7a0ef95 100644 (file)
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -61,7 +61,7 @@ static int fd_attach_hba(struct se_hba *hba, u32 host_id)
 
        pr_debug("CORE_HBA[%d] - TCM FILEIO HBA Driver %s on Generic"
                " Target Core Stack %s\n", hba->hba_id, FD_VERSION,
-               TARGET_CORE_MOD_VERSION);
+               TARGET_CORE_VERSION);
        pr_debug("CORE_HBA[%d] - Attached FILEIO HBA: %u to Generic\n",
                hba->hba_id, fd_host->fd_host_id);
 

diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index a869022..e37db74 100644 (file)
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -57,7 +57,7 @@ static int iblock_attach_hba(struct se_hba *hba, u32 host_id)
 {
        pr_debug("CORE_HBA[%d] - TCM iBlock HBA Driver %s on"
                " Generic Target Core Stack %s\n", hba->hba_id,
-               IBLOCK_VERSION, TARGET_CORE_MOD_VERSION);
+               IBLOCK_VERSION, TARGET_CORE_VERSION);
        return 0;
 }
 

diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index c673980..f757178 100644 (file)
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -80,7 +80,7 @@ static int pscsi_attach_hba(struct se_hba *hba, u32 host_id)
 
        pr_debug("CORE_HBA[%d] - TCM SCSI HBA Driver %s on"
                " Generic Target Core Stack %s\n", hba->hba_id,
-               PSCSI_VERSION, TARGET_CORE_MOD_VERSION);
+               PSCSI_VERSION, TARGET_CORE_VERSION);
        pr_debug("CORE_HBA[%d] - Attached SCSI HBA to Generic\n",
               hba->hba_id);
 

diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c
index e984327..723c97a 100644 (file)
--- a/drivers/target/target_core_rd.c
+++ b/drivers/target/target_core_rd.c
@@ -58,7 +58,7 @@ static int rd_attach_hba(struct se_hba *hba, u32 host_id)
 
        pr_debug("CORE_HBA[%d] - TCM Ramdisk HBA Driver %s on"
                " Generic Target Core Stack %s\n", hba->hba_id,
-               RD_HBA_VERSION, TARGET_CORE_MOD_VERSION);
+               RD_HBA_VERSION, TARGET_CORE_VERSION);
 
        return 0;
 }

diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 2738184..a353033 100644 (file)
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -10,8 +10,7 @@
 #include <net/sock.h>
 #include <net/tcp.h>
 
-#define TARGET_CORE_MOD_VERSION                "v4.1.0"
-#define TARGET_CORE_VERSION            TARGET_CORE_MOD_VERSION
+#define TARGET_CORE_VERSION            "v4.1.0"
 
 /*
  * By default we use 32-byte CDBs in TCM Core and subsystem plugin code.

diff --git a/include/target/target_core_configfs.h b/include/target/target_core_configfs.h
index abd063b..4012ed2 100644 (file)
--- a/include/target/target_core_configfs.h
+++ b/include/target/target_core_configfs.h
@@ -1,4 +1,3 @@
-#define TARGET_CORE_CONFIGFS_VERSION TARGET_CORE_MOD_VERSION
 
 #define TARGET_CORE_CONFIG_ROOT        "/sys/kernel/config"