diff --git a/lib/iscsi/iscsi.h b/lib/iscsi/iscsi.h index 07856d5e7..840d987ef 100644 --- a/lib/iscsi/iscsi.h +++ b/lib/iscsi/iscsi.h @@ -308,7 +308,6 @@ struct spdk_iscsi_opts { bool ImmediateData; uint32_t ErrorRecoveryLevel; bool AllowDuplicateIsid; - uint32_t min_connections_per_core; /* Deprecated */ }; struct spdk_iscsi_globals { diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c index 4a4bd1331..1c15a42b0 100644 --- a/lib/iscsi/iscsi_rpc.c +++ b/lib/iscsi/iscsi_rpc.c @@ -1520,7 +1520,6 @@ static const struct spdk_json_object_decoder rpc_set_iscsi_opts_decoders[] = { {"immediate_data", offsetof(struct spdk_iscsi_opts, ImmediateData), spdk_json_decode_bool, true}, {"error_recovery_level", offsetof(struct spdk_iscsi_opts, ErrorRecoveryLevel), spdk_json_decode_uint32, true}, {"allow_duplicated_isid", offsetof(struct spdk_iscsi_opts, AllowDuplicateIsid), spdk_json_decode_bool, true}, - {"min_connections_per_core", offsetof(struct spdk_iscsi_opts, min_connections_per_core), spdk_json_decode_uint32, true}, }; static void diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c index 2ce31f683..8b9eda996 100644 --- a/lib/iscsi/iscsi_subsystem.c +++ b/lib/iscsi/iscsi_subsystem.c @@ -399,7 +399,6 @@ iscsi_opts_init(struct spdk_iscsi_opts *opts) opts->chap_group = 0; opts->authfile = NULL; opts->nodebase = NULL; - opts->min_connections_per_core = 0; } struct spdk_iscsi_opts * @@ -472,7 +471,6 @@ spdk_iscsi_opts_copy(struct spdk_iscsi_opts *src) dst->require_chap = src->require_chap; dst->mutual_chap = src->mutual_chap; dst->chap_group = src->chap_group; - dst->min_connections_per_core = 0; return dst; } @@ -491,7 +489,6 @@ iscsi_read_config_file_params(struct spdk_conf_section *sp, int ErrorRecoveryLevel; int timeout; int nopininterval; - int min_conn_per_core = 0; const char *ag_tag; int ag_tag_i; int i; @@ -619,10 +616,6 @@ iscsi_read_config_file_params(struct spdk_conf_section *sp, } } } - min_conn_per_core = spdk_conf_section_get_intval(sp, "MinConnectionsPerCore"); - if (min_conn_per_core >= 0) { - SPDK_WARNLOG("MinConnectionsPerCore is deprecated and will be ignored.\n"); - } return 0; } @@ -776,10 +769,6 @@ iscsi_set_global_params(struct spdk_iscsi_opts *opts) g_spdk_iscsi.mutual_chap = opts->mutual_chap; g_spdk_iscsi.chap_group = opts->chap_group; - if (opts->min_connections_per_core) { - SPDK_WARNLOG("iSCSI option 'min_connections_per_core' has been deprecated and will be ignored.\n"); - } - iscsi_log_globals(); return 0; diff --git a/test/config_converter/config.ini b/test/config_converter/config.ini index fdffaa01f..bbfc17373 100644 --- a/test/config_converter/config.ini +++ b/test/config_converter/config.ini @@ -42,7 +42,6 @@ MaxR2T 256 NopInInterval 10 AllowDuplicateIsid Yes - MinConnectionsPerCore 4 DefaultTime2Wait 2 QueueDepth 128