Commit 79b8d37c authored by Changpeng Liu's avatar Changpeng Liu Committed by Jim Harris
Browse files

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: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/421345


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 8d127f78

lib/bdev/nvme/bdev_nvme.c

+1 −19
Original line number Diff line number Diff line
@@ -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,25 +1251,7 @@ 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;