ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev/nvme: remove deprecated option Timeout

Browse Source 
"Timeout" option was replaced with "TimeoutUsec" in SPDK 18.07 release,
while here, remove the option for 18.10.

Change-Id: Id681152a5400f525efcbc9ddbdf558966baef2b3
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/421345
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Changpeng Liu 2018-08-06 04:51:50 -04:00 committed by Jim Harris
parent 8d127f780b
commit 79b8d37c7b
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/bdev/nvme/bdev_nvme.c
View File

@ -1208,7 +1208,7 @@ bdev_nvme_library_init(void)
struct spdk_conf_section *sp; struct spdk_conf_section *sp;
const char *val; const char *val;
int rc = 0; int rc = 0;
int64_t intval; int64_t intval = 0;
size_t i; size_t i;
struct nvme_probe_ctx *probe_ctx = NULL; struct nvme_probe_ctx *probe_ctx = NULL;
int retry_count; int retry_count;
@ -1251,26 +1251,8 @@ bdev_nvme_library_init(void)
} else if (intval < 0) { } else if (intval < 0) {
intval = 0; intval = 0;
} }
} else {
/* Check old name for backward compatibility */
intval = spdk_conf_section_get_intval(sp, "Timeout");
if (intval < 0) {
intval = spdk_conf_section_get_intval(sp, "NvmeTimeoutValue");
if (intval < 0) {
intval = 0;
} else {
intval *= 1000000ULL;
SPDK_WARNLOG("NvmeTimeoutValue (in seconds) was renamed to TimeoutUsec (in microseconds)\n");
SPDK_WARNLOG("Please update your configuration file\n");
}
} else {
intval *= 1000000ULL;
SPDK_WARNLOG("Timeout (in seconds) was renamed to TimeoutUsec (in microseconds)\n");
SPDK_WARNLOG("Please update your configuration file\n");
}
} }
g_opts.timeout_us = intval; g_opts.timeout_us = intval;
if (g_opts.timeout_us > 0) { if (g_opts.timeout_us > 0) {