From 3d12e6d4e691f5049731baec4bb5b0f5c5a17d2d Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Thu, 8 Aug 2019 01:03:47 -0400 Subject: [PATCH] bdev/nvme: deprecate ResetControllerOnTimeout configuration option 'ResetControllerOnTimeout' was renamed to 'ActionOnTimeout' for a long time, so we deprecate the support for this old configuration option. Change-Id: Ia44035a8749ca046c1df16f82601389b5bafeb76 Signed-off-by: Changpeng Liu Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/464491 Tested-by: SPDK CI Jenkins Reviewed-by: Broadcom SPDK FC-NVMe CI Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- lib/bdev/nvme/bdev_nvme.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/bdev/nvme/bdev_nvme.c b/lib/bdev/nvme/bdev_nvme.c index 60fc3fc9b..0b1247306 100644 --- a/lib/bdev/nvme/bdev_nvme.c +++ b/lib/bdev/nvme/bdev_nvme.c @@ -1404,17 +1404,6 @@ bdev_nvme_library_init(void) } else if (!strcasecmp(val, "Abort")) { g_opts.action_on_timeout = SPDK_BDEV_NVME_TIMEOUT_ACTION_ABORT; } - } else { - /* Handle old name for backward compatibility */ - val = spdk_conf_section_get_val(sp, "ResetControllerOnTimeout"); - if (val) { - SPDK_WARNLOG("ResetControllerOnTimeout was renamed to ActionOnTimeout\n"); - SPDK_WARNLOG("Please update your configuration file\n"); - - if (spdk_conf_section_get_boolval(sp, "ResetControllerOnTimeout", false)) { - g_opts.action_on_timeout = SPDK_BDEV_NVME_TIMEOUT_ACTION_RESET; - } - } } }