linux-nvme.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Martin George <martinus.gpy@gmail.com>
To: linux-nvme@lists.infradead.org
Cc: Martin George <marting@netapp.com>
Subject: [PATCH] fabrics: ensure zero kato for non-persistent controllers
Date: Thu, 18 Feb 2021 15:24:22 +0530	[thread overview]
Message-ID: <20210218095422.5696-1-marting@netapp.com> (raw)

Along with ensuring a non-zero kato is passed to a
persistent discovery controller, also ensure a zero
kato is passed to a non-persistent discovery controller.

Signed-off-by: Martin George <marting@netapp.com>
---
 fabrics.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fabrics.c b/fabrics.c
index 1880a5d..ed15e08 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -1399,6 +1399,8 @@ static int discover_from_conf_file(const char *desc, char *argstr,
 
 		if (cfg.persistent && !cfg.keep_alive_tmo)
 			cfg.keep_alive_tmo = NVMF_DEF_DISC_TMO;
+		else if (!cfg.persistent && (cfg.keep_alive_tmo > 0))
+			cfg.keep_alive_tmo = 0;
 
 		if (traddr_is_hostname(&cfg)) {
 			ret = hostname2traddr(&cfg);
@@ -1474,6 +1476,8 @@ int fabrics_discover(const char *desc, int argc, char **argv, bool connect)
 	} else {
 		if (cfg.persistent && !cfg.keep_alive_tmo)
 			cfg.keep_alive_tmo = NVMF_DEF_DISC_TMO;
+		else if (!cfg.persistent && (cfg.keep_alive_tmo > 0))
+			cfg.keep_alive_tmo = 0;
 
 		if (traddr_is_hostname(&cfg)) {
 			ret = hostname2traddr(&cfg);
-- 
2.30.0


_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

             reply	other threads:[~2021-02-18  9:54 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-18  9:54 Martin George [this message]
2021-02-23  5:41 ` [PATCH] fabrics: ensure zero kato for non-persistent controllers George, Martin
2021-02-23  6:06   ` Chaitanya Kulkarni
2021-02-23  9:56     ` George, Martin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210218095422.5696-1-marting@netapp.com \
    --to=martinus.gpy@gmail.com \
    --cc=linux-nvme@lists.infradead.org \
    --cc=marting@netapp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).