tree: avoid updating --tls in nvme_read_sysfs_tls()

It is wrongly assumed that the presence of the sysfs tls_key
attribute indicates --tls alone was invoked. But this can
also happen if --concat was invoked as well. And both --tls
and --concat are mutually exclusive. Also, both --tls and
--concat are already appropriately set earlier during configured
& generated PSK TLS workflows respectively. So avoid explicitly
setting --tls again here in nvme_read_sysfs_tls() as that's
unnecessary and incorrect too.

Signed-off-by: Martin George <[email protected]>
(cherry picked from f1818da3448f)
Signed-off-by: Daniel Wagner <[email protected]>

Author: martin-gpy

src/nvme/tree.c

@@ -2013,10 +2013,9 @@ static void nvme_read_sysfs_tls(nvme_root_t r, nvme_ctrl_t c)
 
 	key = nvme_get_ctrl_attr(c, "tls_key");
 	if (!key) {
-		/* tls_key is only present if --tls has been used. */
+		/* tls_key is only present if --tls or --concat has been used */
 		return;
 	}
-	c->cfg.tls = true;
 
 	keyring = nvme_get_ctrl_attr(c, "tls_keyring");
 	nvme_ctrl_set_keyring(c, keyring);