admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

libiscsi: Reduce the size of struct iscsi_context

Browse Source 
Reduce the size of struct iscsi_context by reordering the members of this
data structure. Additionally, change the rdma_ack_timeout value from
'unsigned char' into 'uint8_t' to make it clear that this variable
represents an integer.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
This commit is contained in:
Bart Van Assche
2020-03-07 12:32:35 -08:00
parent 6ed1ffb7b2
commit bac94c18b8
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/iscsi-private.h
View File

@@ -89,6 +89,7 @@ struct iscsi_context {
enum iscsi_session_type session_type; enum iscsi_session_type session_type;
unsigned char isid[6]; unsigned char isid[6];
uint8_t rdma_ack_timeout;
uint32_t itt; uint32_t itt;
uint32_t cmdsn; uint32_t cmdsn;
uint32_t min_cmdsn_waiting; uint32_t min_cmdsn_waiting;
@@ -109,8 +110,6 @@ struct iscsi_context {
int tcp_syncnt; int tcp_syncnt;
int tcp_nonblocking; int tcp_nonblocking;
unsigned char rdma_ack_timeout;
int current_phase; int current_phase;
int next_phase; int next_phase;
#define ISCSI_LOGIN_SECNEG_PHASE_OFFER_CHAP 0 #define ISCSI_LOGIN_SECNEG_PHASE_OFFER_CHAP 0

4
lib/init.c
View File

@@ -281,7 +281,7 @@ iscsi_create_context(const char *initiator_name)
} }
if (getenv("LIBISCSI_RDMA_ACK_TIMEOUT") != NULL) { if (getenv("LIBISCSI_RDMA_ACK_TIMEOUT") != NULL) {
iscsi->rdma_ack_timeout = (unsigned char)atoi(getenv("LIBISCSI_RDMA_ACK_TIMEOUT")); iscsi->rdma_ack_timeout = atoi(getenv("LIBISCSI_RDMA_ACK_TIMEOUT"));
} }
/* iscsi->smalloc_size is the size for small allocations. this should be /* iscsi->smalloc_size is the size for small allocations. this should be
@@ -622,7 +622,7 @@ iscsi_parse_url(struct iscsi_context *iscsi, const char *url, int full)
} else if (!strcmp(key, "iser")) { } else if (!strcmp(key, "iser")) {
is_iser = 1; is_iser = 1;
} else if (!strcmp(key, "LIBISCSI_RDMA_ACK_TIMEOUT")) { } else if (!strcmp(key, "LIBISCSI_RDMA_ACK_TIMEOUT")) {
iscsi->rdma_ack_timeout = (unsigned char)atoi(value); iscsi->rdma_ack_timeout = atoi(value);
#endif #endif
} }
tmp = next; tmp = next;

2
lib/iser.c
View File

@@ -830,7 +830,7 @@ void iscsi_set_rdma_ack_timetout(struct iscsi_context *iscsi, unsigned char valu
*/ */
int iser_rdma_set_option(struct rdma_cm_id *cma_id, struct iscsi_context *iscsi) { int iser_rdma_set_option(struct rdma_cm_id *cma_id, struct iscsi_context *iscsi) {
int ret = 0; int ret = 0;
unsigned char timeout = iscsi->rdma_ack_timeout; uint8_t timeout = iscsi->rdma_ack_timeout;
if (timeout) { if (timeout) {
#ifdef HAVE_RDMA_ACK_TIMEOUT #ifdef HAVE_RDMA_ACK_TIMEOUT