From: James Simmons <jsimmons@infradead.org>
Date: Fri, 15 Mar 2024 15:19:08 +0000 (-0400)
Subject: LU-17638 util: remove newer lnetctl export handling
X-Git-Tag: 2.15.62~111
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=a456103fd70434f775a5763b7548256c7bb66ea0;p=fs%2Flustre-release.git

LU-17638 util: remove newer lnetctl export handling

On the current maloo VMs lnetctl export ends up segfaulting. For
now go back to the original code until we figure out what is
different on this setup and yet it works elsewhere. The reason
for a partial reveret is other important works are ready to land
that would be delayed by a full revert.

Fixes: d3ef8f6993 ("LU-9680 lnet: add NLM_F_DUMP_FILTERED support")
Test-Parameters: trivial testlist=sanity-lnet
Signed-off-by: James Simmons <jsimmons@infradead.org>
Change-Id: Ibd3437ee619cde9667d049455d641a602ea50174
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54436
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Frank Sehr <fsehr@whamcloud.com>
Reviewed-by: Chris Horn <chris.horn@hpe.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---

diff --git a/lnet/utils/lnetctl.c b/lnet/utils/lnetctl.c
index 8851c1c..299b367 100644
--- a/lnet/utils/lnetctl.c
+++ b/lnet/utils/lnetctl.c
@@ -3955,36 +3955,6 @@ static int jt_export(int argc, char **argv)
 			return -1;
 	}
 
-	rc = yaml_lnet_config_ni(NULL, NULL, NULL, NULL, -1, NULL,
-				 flags & NLM_F_DUMP_FILTERED ? 1 : 2,
-				 flags);
-	if (rc < 0) {
-		if (rc == -EOPNOTSUPP)
-			goto old_api;
-	}
-
-	rc = yaml_lnet_route(NULL, NULL, -1, -1, -1, LNET_GENL_VERSION, flags);
-	if (rc < 0) {
-		if (rc == -EOPNOTSUPP)
-			goto old_api;
-	}
-
-	rc = lustre_lnet_show_routing(-1, &show_rc, &err_rc, backup);
-	if (rc != LUSTRE_CFG_RC_NO_ERR) {
-		cYAML_print_tree2file(stderr, err_rc);
-		cYAML_free_tree(err_rc);
-		err_rc = NULL;
-	}
-
-	rc = yaml_lnet_peer(NULL, NULL, false, -1, false, false,
-			    flags & NLM_F_DUMP_FILTERED ? 0 : 3, flags);
-	if (rc < 0) {
-		if (rc == -EOPNOTSUPP)
-			goto old_api;
-	}
-	goto show_others;
-
-old_api:
 	rc = lustre_lnet_show_net(NULL, 2, -1, &show_rc, &err_rc, backup);
 	if (rc != LUSTRE_CFG_RC_NO_ERR) {
 		cYAML_print_tree2file(stderr, err_rc);
@@ -4013,7 +3983,7 @@ old_api:
 		cYAML_free_tree(err_rc);
 		err_rc = NULL;
 	}
-show_others:
+
 	rc = lustre_lnet_show_numa_range(-1, &show_rc, &err_rc);
 	if (rc != LUSTRE_CFG_RC_NO_ERR) {
 		cYAML_print_tree2file(stderr, err_rc);