tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Christoph Hellwig and committed by
Nicholas Bellinger ce8dd25d b753d643

+8 -10
+3 -3
drivers/target/target_core_configfs.c
··· 103 103 char *page) 104 104 { 105 105 return sprintf(page, "Target Engine Core ConfigFS Infrastructure %s" 106 - " on %s/%s on "UTS_RELEASE"\n", TARGET_CORE_CONFIGFS_VERSION, 106 + " on %s/%s on "UTS_RELEASE"\n", TARGET_CORE_VERSION, 107 107 utsname()->sysname, utsname()->machine); 108 108 } 109 109 ··· 3235 3235 { 3236 3236 return sprintf(page, "HBA Index: %d plugin: %s version: %s\n", 3237 3237 hba->hba_id, hba->backend->ops->name, 3238 - TARGET_CORE_CONFIGFS_VERSION); 3238 + TARGET_CORE_VERSION); 3239 3239 } 3240 3240 3241 3241 SE_HBA_ATTR_RO(hba_info); ··· 3507 3507 goto out_global; 3508 3508 } 3509 3509 pr_debug("TARGET_CORE[0]: Initialized ConfigFS Fabric" 3510 - " Infrastructure: "TARGET_CORE_CONFIGFS_VERSION" on %s/%s" 3510 + " Infrastructure: "TARGET_CORE_VERSION" on %s/%s" 3511 3511 " on "UTS_RELEASE"\n", utsname()->sysname, utsname()->machine); 3512 3512 /* 3513 3513 * Register built-in RAMDISK subsystem logic for virtual LUN 0
+1 -1
drivers/target/target_core_file.c
··· 61 61 62 62 pr_debug("CORE_HBA[%d] - TCM FILEIO HBA Driver %s on Generic" 63 63 " Target Core Stack %s\n", hba->hba_id, FD_VERSION, 64 - TARGET_CORE_MOD_VERSION); 64 + TARGET_CORE_VERSION); 65 65 pr_debug("CORE_HBA[%d] - Attached FILEIO HBA: %u to Generic\n", 66 66 hba->hba_id, fd_host->fd_host_id); 67 67
+1 -1
drivers/target/target_core_iblock.c
··· 57 57 { 58 58 pr_debug("CORE_HBA[%d] - TCM iBlock HBA Driver %s on" 59 59 " Generic Target Core Stack %s\n", hba->hba_id, 60 - IBLOCK_VERSION, TARGET_CORE_MOD_VERSION); 60 + IBLOCK_VERSION, TARGET_CORE_VERSION); 61 61 return 0; 62 62 } 63 63
+1 -1
drivers/target/target_core_pscsi.c
··· 80 80 81 81 pr_debug("CORE_HBA[%d] - TCM SCSI HBA Driver %s on" 82 82 " Generic Target Core Stack %s\n", hba->hba_id, 83 - PSCSI_VERSION, TARGET_CORE_MOD_VERSION); 83 + PSCSI_VERSION, TARGET_CORE_VERSION); 84 84 pr_debug("CORE_HBA[%d] - Attached SCSI HBA to Generic\n", 85 85 hba->hba_id); 86 86
+1 -1
drivers/target/target_core_rd.c
··· 58 58 59 59 pr_debug("CORE_HBA[%d] - TCM Ramdisk HBA Driver %s on" 60 60 " Generic Target Core Stack %s\n", hba->hba_id, 61 - RD_HBA_VERSION, TARGET_CORE_MOD_VERSION); 61 + RD_HBA_VERSION, TARGET_CORE_VERSION); 62 62 63 63 return 0; 64 64 }
+1 -2
include/target/target_core_base.h
··· 10 10 #include <net/sock.h> 11 11 #include <net/tcp.h> 12 12 13 - #define TARGET_CORE_MOD_VERSION "v4.1.0" 14 - #define TARGET_CORE_VERSION TARGET_CORE_MOD_VERSION 13 + #define TARGET_CORE_VERSION "v4.1.0" 15 14 16 15 /* 17 16 * By default we use 32-byte CDBs in TCM Core and subsystem plugin code.
-1
include/target/target_core_configfs.h
··· 1 - #define TARGET_CORE_CONFIGFS_VERSION TARGET_CORE_MOD_VERSION 2 1 3 2 #define TARGET_CORE_CONFIG_ROOT "/sys/kernel/config" 4 3