From 79b8d37c7b8ca3938f13e578daa222f227d17d91 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Mon, 6 Aug 2018 04:51:50 -0400 Subject: [PATCH] bdev/nvme: remove deprecated option Timeout "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 Reviewed-on: https://review.gerrithub.io/421345 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto --- lib/bdev/nvme/bdev_nvme.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/lib/bdev/nvme/bdev_nvme.c b/lib/bdev/nvme/bdev_nvme.c index a1c5cd1ce..d95242b8f 100644 --- a/lib/bdev/nvme/bdev_nvme.c +++ b/lib/bdev/nvme/bdev_nvme.c @@ -1208,7 +1208,7 @@ bdev_nvme_library_init(void) struct spdk_conf_section *sp; const char *val; int rc = 0; - int64_t intval; + int64_t intval = 0; size_t i; struct nvme_probe_ctx *probe_ctx = NULL; int retry_count; @@ -1251,26 +1251,8 @@ bdev_nvme_library_init(void) } else if (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; if (g_opts.timeout_us > 0) {