libnvme/fabric: drop fabric_args from nvmf_create_discovery_ctrl()

All information is already present in nvmf_context.

Signed-off-by: Hannes Reinecke <[email protected]>

Author: hreinecke

libnvme/src/nvme/fabrics.c

@@ -2106,7 +2106,6 @@ static int __create_discovery_ctrl(struct nvme_global_ctx *ctx,
 static int nvmf_create_discovery_ctrl(struct nvme_global_ctx *ctx,
 		struct nvmf_context *fctx, nvme_host_t h,
 		struct nvme_fabrics_config *cfg,
-		struct fabric_args *trcfg,
 		struct nvme_ctrl **ctrl)
 {
 	_cleanup_free_ struct nvme_id_ctrl *id = NULL;
@@ -2221,15 +2220,6 @@ int _discovery_config_json(struct nvme_global_ctx *ctx,
 
 	memcpy(&cfg, fctx->cfg, sizeof(cfg));
 
-	struct fabric_args trcfg = {
-		.subsysnqn      = next_fctx.subsysnqn,
-		.transport      = next_fctx.transport,
-		.traddr         = next_fctx.traddr,
-		.trsvcid        = next_fctx.trsvcid,
-		.host_traddr    = next_fctx.host_traddr,
-		.host_iface     = next_fctx.host_iface,
-	};
-
 	if (!force) {
 		cn = lookup_ctrl(h, &next_fctx);
 		if (cn) {
@@ -2239,7 +2229,7 @@ int _discovery_config_json(struct nvme_global_ctx *ctx,
 		}
 	}
 
-	ret = nvmf_create_discovery_ctrl(ctx, &next_fctx, h, &cfg, &trcfg, &cn);
+	ret = nvmf_create_discovery_ctrl(ctx, &next_fctx, h, &cfg, &cn);
 	if (ret)
 		return 0;
 
@@ -2383,14 +2373,6 @@ int nvmf_discovery_config_file(struct nvme_global_ctx *ctx,
 			break;
 
 		struct nvmf_context next_fctx = *fctx;
-		struct fabric_args trcfg = {
-			.subsysnqn	= fctx->subsysnqn,
-			.transport	= fctx->transport,
-			.traddr		= fctx->traddr,
-			.trsvcid	= fctx->trsvcid,
-			.host_traddr	= fctx->host_traddr,
-			.host_iface	= fctx->host_iface,
-		};
 
 		if (!force) {
 			c = lookup_ctrl(h, &next_fctx);
@@ -2401,7 +2383,7 @@ int nvmf_discovery_config_file(struct nvme_global_ctx *ctx,
 		}
 
 		err = nvmf_create_discovery_ctrl(ctx, &next_fctx, h, fctx->cfg,
-			&trcfg, &c);
+			&c);
 		if (err)
 			continue;
 
@@ -2940,14 +2922,14 @@ int nvmf_discovery_nbft(struct nvme_global_ctx *ctx,
 
 			if (!c) {
 				ret = nvmf_create_discovery_ctrl(ctx, &nfctx, h,
-					fctx->cfg, &trcfg, &c);
+					fctx->cfg, &c);
 				if (ret == -ENVME_CONNECT_ADDRNOTAVAIL &&
 				    !strcmp(nfctx.transport, "tcp") &&
 				    strlen(hfi->tcp_info.dhcp_server_ipaddr) > 0) {
 					trcfg.host_traddr = NULL;
 					nfctx.traddr = NULL;
 					ret = nvmf_create_discovery_ctrl(ctx,
-						&nfctx, h, fctx->cfg, &trcfg, &c);
+						&nfctx, h, fctx->cfg, &c);
 				}
 			} else
 				ret = 0;
@@ -3048,24 +3030,14 @@ int nvmf_discovery(struct nvme_global_ctx *ctx, struct nvmf_context *fctx,
 		}
 	}
 
-	struct fabric_args trcfg = {
-		.subsysnqn	= fctx->subsysnqn,
-		.transport	= fctx->transport,
-		.traddr		= fctx->traddr,
-		.trsvcid	= fctx->trsvcid,
-		.host_traddr	= fctx->host_traddr,
-		.host_iface	= fctx->host_iface,
-	};
-
 	if (!c && !force) {
 		c = lookup_ctrl(h, fctx);
 		if (c)
 			fctx->persistent = true;
 	}
 	if (!c) {
 		/* No device or non-matching device, create a new controller */
-		ret = nvmf_create_discovery_ctrl(ctx, fctx, h, fctx->cfg,
-			&trcfg, &c);
+		ret = nvmf_create_discovery_ctrl(ctx, fctx, h, fctx->cfg, &c);
 		if (ret) {
 			if (ret != -ENVME_CONNECT_IGNORED)
 				nvme_msg(ctx, LOG_ERR,