From: Johannes Thumshirn <jthumshirn@suse.de>
Date: Thu, 9 Aug 2018 09:25:23 +0000 (+0200)
Subject: fabrics: write keep-alive-timeout to fabrics device on connect
X-Git-Tag: v1.7~106
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9e77dd52622a3e3bf20c9d6d0367909da531f422;p=users%2Fsagi%2Fnvme-cli.git

fabrics: write keep-alive-timeout to fabrics device on connect

Commit 7099227b07a8 ("fabrics: add option to supply keep-alive-timeout
for connect-all") introduced a keep-alive-timeout option for
connect-all but forgot to write it down to the kernel's fabrics
device in connect_ctrl().

Pass down the keep-alove-timeouts if we're connecting to a non
discovery controller.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Fixes: 7099227b07a8 ("fabrics: add option to supply keep-alive-timeout for connect-all")
Signed-off-by: Keith Busch <keith.busch@intel.com>
---

diff --git a/fabrics.c b/fabrics.c
index 241d8b86..28e97c5a 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -628,6 +628,13 @@ static int connect_ctrl(struct nvmf_disc_rsp_page_entry *e)
 		p += len;
 	}
 
+	if (cfg.keep_alive_tmo && !discover) {
+		len = sprintf(p, ",keep_alive_tmo=%s", cfg.keep_alive_tmo);
+		if (len < 0)
+			return -EINVAL;
+		p += len;
+	}
+
 	switch (e->trtype) {
 	case NVMF_TRTYPE_LOOP: /* loop */
 		len = sprintf(p, ",transport=loop");