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

scsi: target: use ISCSI_IQN_LEN in iscsi_target_stat

Move the ISCSI_IQN_LEN definition up, so that it can be used in more
places instead of a hardcoded value.

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

authored by

David Disseldorp and committed by
Martin K. Petersen
df711553 3bccfba8

+7 -7
+2 -2
drivers/target/iscsi/iscsi_target_stat.c
··· 328 328 { 329 329 struct iscsi_tiqn *tiqn = iscsi_tgt_attr_tiqn(item); 330 330 struct iscsi_login_stats *lstat = &tiqn->login_stats; 331 - unsigned char buf[224]; 331 + unsigned char buf[ISCSI_IQN_LEN]; 332 332 333 333 spin_lock(&lstat->lock); 334 - snprintf(buf, 224, "%s", lstat->last_intr_fail_name[0] ? 334 + snprintf(buf, ISCSI_IQN_LEN, "%s", lstat->last_intr_fail_name[0] ? 335 335 lstat->last_intr_fail_name : NONE); 336 336 spin_unlock(&lstat->lock); 337 337
+3 -3
include/target/iscsi/iscsi_target_core.h
··· 25 25 #define ISCSIT_TCP_BACKLOG 256 26 26 #define ISCSI_RX_THREAD_NAME "iscsi_trx" 27 27 #define ISCSI_TX_THREAD_NAME "iscsi_ttx" 28 + #define ISCSI_IQN_LEN 224 28 29 29 30 /* struct iscsi_node_attrib sanity values */ 30 31 #define NA_DATAOUT_TIMEOUT 3 ··· 271 270 }; 272 271 273 272 struct iscsi_sess_ops { 274 - char InitiatorName[224]; 273 + char InitiatorName[ISCSI_IQN_LEN]; 275 274 char InitiatorAlias[256]; 276 - char TargetName[224]; 275 + char TargetName[ISCSI_IQN_LEN]; 277 276 char TargetAlias[256]; 278 277 char TargetAddress[256]; 279 278 u16 TargetPortalGroupTag; /* [0..65535] */ ··· 856 855 }; 857 856 858 857 struct iscsi_tiqn { 859 - #define ISCSI_IQN_LEN 224 860 858 unsigned char tiqn[ISCSI_IQN_LEN]; 861 859 enum tiqn_state_table tiqn_state; 862 860 int tiqn_access_count;
+2 -2
include/target/iscsi/iscsi_target_stat.h
··· 33 33 u32 cxn_timeout_errors; 34 34 u32 pdu_format_errors; 35 35 u32 last_sess_failure_type; 36 - char last_sess_fail_rem_name[224]; 36 + char last_sess_fail_rem_name[ISCSI_IQN_LEN]; 37 37 } ____cacheline_aligned; 38 38 39 39 /* iSCSI login failure types (sub oids) */ ··· 56 56 u32 last_fail_type; 57 57 int last_intr_fail_ip_family; 58 58 struct sockaddr_storage last_intr_fail_sockaddr; 59 - char last_intr_fail_name[224]; 59 + char last_intr_fail_name[ISCSI_IQN_LEN]; 60 60 } ____cacheline_aligned; 61 61 62 62 /* iSCSI logout stats */