summaryrefslogtreecommitdiffstats
path: root/drivers/nvme/host/fabrics.c
diff options
context:
space:
mode:
authorSagi Grimberg2016-06-22 14:06:01 +0200
committerJens Axboe2016-07-12 17:31:11 +0200
commit6a92967ccbfc20f94055c9a94bf951230cbd0452 (patch)
tree7620fe4a35acb7a2caf6969b4f5cf9c07c68b77b /drivers/nvme/host/fabrics.c
parentnvme-rdma: Don't use tl_retry_count (diff)
downloadkernel-qcow2-linux-6a92967ccbfc20f94055c9a94bf951230cbd0452.tar.gz
kernel-qcow2-linux-6a92967ccbfc20f94055c9a94bf951230cbd0452.tar.xz
kernel-qcow2-linux-6a92967ccbfc20f94055c9a94bf951230cbd0452.zip
nvme-fabrics: Remove tl_retry_count
The timeout before error recovery logic kicks in is dictated by the nvme keep-alive, so we don't really need a transport layer retry count. transports can retry for as much as they like. Signed-off-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme/host/fabrics.c')
-rw-r--r--drivers/nvme/host/fabrics.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c
index b86b6379ef0c..0a5a4c4684bc 100644
--- a/drivers/nvme/host/fabrics.c
+++ b/drivers/nvme/host/fabrics.c
@@ -503,7 +503,6 @@ static const match_table_t opt_tokens = {
{ NVMF_OPT_NQN, "nqn=%s" },
{ NVMF_OPT_QUEUE_SIZE, "queue_size=%d" },
{ NVMF_OPT_NR_IO_QUEUES, "nr_io_queues=%d" },
- { NVMF_OPT_TL_RETRY_COUNT, "tl_retry_count=%d" },
{ NVMF_OPT_RECONNECT_DELAY, "reconnect_delay=%d" },
{ NVMF_OPT_KATO, "keep_alive_tmo=%d" },
{ NVMF_OPT_HOSTNQN, "hostnqn=%s" },
@@ -521,7 +520,6 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,
/* Set defaults */
opts->queue_size = NVMF_DEF_QUEUE_SIZE;
opts->nr_io_queues = num_online_cpus();
- opts->tl_retry_count = 2;
opts->reconnect_delay = NVMF_DEF_RECONNECT_DELAY;
options = o = kstrdup(buf, GFP_KERNEL);
@@ -605,18 +603,6 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,
opts->nr_io_queues = min_t(unsigned int,
num_online_cpus(), token);
break;
- case NVMF_OPT_TL_RETRY_COUNT:
- if (match_int(args, &token)) {
- ret = -EINVAL;
- goto out;
- }
- if (token < 0) {
- pr_err("Invalid tl_retry_count %d\n", token);
- ret = -EINVAL;
- goto out;
- }
- opts->tl_retry_count = token;
- break;
case NVMF_OPT_KATO:
if (match_int(args, &token)) {
ret = -EINVAL;