From 73c5108684f228d5ea55324f9cba1c4e6c1e4d68 Mon Sep 17 00:00:00 2001 From: Ziye Yang Date: Wed, 20 Feb 2019 06:03:10 +0800 Subject: [PATCH] bdev/nvme: Enable the timeout function if timeout value is provided We should not add addtional check since we already have this option in timeout_cb function, the addtional check is unnecessary. Change-Id: I77c89303155e0c14072a1838994f9e76a0ffc0f4 Signed-off-by: Ziye Yang Reviewed-on: https://review.gerrithub.io/c/445319 Tested-by: SPDK CI Jenkins Reviewed-by: Seth Howell Reviewed-by: Changpeng Liu Reviewed-by: Ben Walker --- lib/bdev/nvme/bdev_nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bdev/nvme/bdev_nvme.c b/lib/bdev/nvme/bdev_nvme.c index 5981fe48c..870fa6042 100644 --- a/lib/bdev/nvme/bdev_nvme.c +++ b/lib/bdev/nvme/bdev_nvme.c @@ -1047,7 +1047,7 @@ create_ctrlr(struct spdk_nvme_ctrlr *ctrlr, TAILQ_INSERT_TAIL(&g_nvme_ctrlrs, nvme_ctrlr, tailq); - if (g_opts.timeout_us > 0 && g_opts.action_on_timeout != SPDK_BDEV_NVME_TIMEOUT_ACTION_NONE) { + if (g_opts.timeout_us > 0) { spdk_nvme_ctrlr_register_timeout_callback(ctrlr, g_opts.timeout_us, timeout_cb, NULL); }