From d3526f523e9e56a6190f3514547d7355ade53d4d Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Thu, 14 Feb 2019 16:19:23 +0900 Subject: [PATCH] iscsi: Replace duplicated macro constant DEFAULT_FIRSTBURSTLENGTH Replace DEFAULT_FIRSTBURSTLENGTH by SPDK_ISCSI_FIRST_BURST_LENGTH. Change-Id: Ia90ef714fab79dff4f9b9eb92ade8cfed3391450 Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/c/444535 Tested-by: SPDK CI Jenkins Reviewed-by: Pawel Wodkowski Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- lib/iscsi/iscsi.c | 2 +- lib/iscsi/iscsi.h | 1 - lib/iscsi/iscsi_subsystem.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c index 2a6fbdb6b..93e4b6c3b 100644 --- a/lib/iscsi/iscsi.c +++ b/lib/iscsi/iscsi.c @@ -511,7 +511,7 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu) * FirstBurstLength as our maximum data segment length * value. */ - max_segment_len = DEFAULT_FIRSTBURSTLENGTH; + max_segment_len = SPDK_ISCSI_FIRST_BURST_LENGTH; } else if (pdu->bhs.opcode == ISCSI_OP_SCSI_DATAOUT) { max_segment_len = spdk_get_data_out_buffer_size(); } else if (pdu->bhs.opcode == ISCSI_OP_NOPOUT) { diff --git a/lib/iscsi/iscsi.h b/lib/iscsi/iscsi.h index 6734f5b18..b9115986b 100644 --- a/lib/iscsi/iscsi.h +++ b/lib/iscsi/iscsi.h @@ -67,7 +67,6 @@ #define DEFAULT_MAXOUTSTANDINGR2T 1 #define DEFAULT_DEFAULTTIME2WAIT 2 #define DEFAULT_DEFAULTTIME2RETAIN 20 -#define DEFAULT_FIRSTBURSTLENGTH 8192 #define DEFAULT_INITIALR2T true #define DEFAULT_IMMEDIATEDATA true #define DEFAULT_DATAPDUINORDER true diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c index 85c16518e..01d68b34e 100644 --- a/lib/iscsi/iscsi_subsystem.c +++ b/lib/iscsi/iscsi_subsystem.c @@ -386,7 +386,7 @@ spdk_iscsi_opts_init(struct spdk_iscsi_opts *opts) opts->MaxQueueDepth = DEFAULT_MAX_QUEUE_DEPTH; opts->DefaultTime2Wait = DEFAULT_DEFAULTTIME2WAIT; opts->DefaultTime2Retain = DEFAULT_DEFAULTTIME2RETAIN; - opts->FirstBurstLength = DEFAULT_FIRSTBURSTLENGTH; + opts->FirstBurstLength = SPDK_ISCSI_FIRST_BURST_LENGTH; opts->ImmediateData = DEFAULT_IMMEDIATEDATA; opts->AllowDuplicateIsid = false; opts->ErrorRecoveryLevel = DEFAULT_ERRORRECOVERYLEVEL;