File 0035-fabrics-do-not-use-queue_size-and-nr_io_queues-for-d.patch of Package nvme-cli.10932

From 875a63609d422404f68eef31a93796646d1175da Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 12 Feb 2019 13:37:43 +0100
Subject: [PATCH] fabrics: do not use 'queue_size' and 'nr_io_queues' for
 discovery controller

When connecting to a discovery controller 'queue_size' and 'nr_io_queues'
are invalid, so we shouldn't be adding them to the connect string.

Signed-off-by: Hannes Reinecke <hare@suse.com>
---
 fabrics.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fabrics.c b/fabrics.c
index 54b1ea2..fb00382 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -635,14 +635,14 @@ static int connect_ctrl(struct nvmf_disc_rsp_page_entry *e)
 		p += len;
 	}
 
-	if (cfg.queue_size) {
+	if (cfg.queue_size && !discover) {
 		len = sprintf(p, ",queue_size=%d", cfg.queue_size);
 		if (len < 0)
 			return -EINVAL;
 		p += len;
 	}
 
-	if (cfg.nr_io_queues) {
+	if (cfg.nr_io_queues && !discover) {
 		len = sprintf(p, ",nr_io_queues=%d", cfg.nr_io_queues);
 		if (len < 0)
 			return -EINVAL;
-- 
2.13.7