LU-10391 lnet: update ping to handle multiple NIDs

[fs/lustre-release.git] / lnet / utils / lnetctl.c

diff --git a/lnet/utils/lnetctl.c b/lnet/utils/lnetctl.c
index 9980529..7692efe 100644 (file)
--- a/lnet/utils/lnetctl.c
+++ b/lnet/utils/lnetctl.c
@@ -4413,13 +4413,13 @@ static int jt_ping(int argc, char **argv)
        int timeout = 1000;
        int rc = 0, opt;
        char *src_nidstr = NULL;
-
        const char *const short_options = "hs:t:";
        const struct option long_options[] = {
-       { .name = "help",       .has_arg = no_argument,         .val = 'h' },
-       { .name = "timeout",    .has_arg = required_argument,   .val = 't' },
-       { .name = "source",     .has_arg = required_argument,   .val = 's' },
-       { .name = NULL } };
+               { .name = "help",       .has_arg = no_argument,         .val = 'h' },
+               { .name = "timeout",    .has_arg = required_argument,   .val = 't' },
+               { .name = "source",     .has_arg = required_argument,   .val = 's' },
+               { .name = NULL }
+       };
 
        while ((opt = getopt_long(argc, argv, short_options,
                                  long_options, NULL)) != -1) {
@@ -4441,6 +4441,13 @@ static int jt_ping(int argc, char **argv)
                }
        }
 
+       rc = yaml_lnet_ping("ping", timeout, src_nidstr, optind, argc,
+                           argv, NLM_F_DUMP);
+       if (rc <= 0) {
+               if (rc != -EOPNOTSUPP)
+                       return rc;
+       }
+
        for (; optind < argc; optind++)
                rc = lustre_lnet_ping_nid(argv[optind], src_nidstr, timeout, -1,
                                          &show_rc, &err_rc);