diff --git a/lnet/utils/portals.c b/lnet/utils/portals.c index 5fe1777d64dba9647c188ee5f3e48b1a8f5223ab..2d1a0b5ec7be5e28d74c93410483653626809ebc 100644 --- a/lnet/utils/portals.c +++ b/lnet/utils/portals.c @@ -297,9 +297,13 @@ int g_nal_is_compatible (char *cmd, ...) if (g_nal == nal) return (1); - - fprintf (stderr, "Command %s not compatible with nal %s\n", - cmd, nal2name (g_nal)); + + if (cmd != NULL) { + /* Don't complain verbosely if we've not been passed a command + * name to complain about! */ + fprintf (stderr, "Command %s not compatible with nal %s\n", + cmd, nal2name (g_nal)); + } return (0); } @@ -841,8 +845,8 @@ int jt_ptl_disconnect(int argc, char **argv) return 0; } - if (!g_nal_is_compatible (argv[0], SOCKNAL, TOENAL, 0)) - return -1; + if (!g_nal_is_compatible (NULL, SOCKNAL, TOENAL, 0)) + return 0; if (argc >= 2 && ptl_parse_nid (&nid, argv[1]) != 0) { diff --git a/lustre/portals/utils/portals.c b/lustre/portals/utils/portals.c index 5fe1777d64dba9647c188ee5f3e48b1a8f5223ab..2d1a0b5ec7be5e28d74c93410483653626809ebc 100644 --- a/lustre/portals/utils/portals.c +++ b/lustre/portals/utils/portals.c @@ -297,9 +297,13 @@ int g_nal_is_compatible (char *cmd, ...) if (g_nal == nal) return (1); - - fprintf (stderr, "Command %s not compatible with nal %s\n", - cmd, nal2name (g_nal)); + + if (cmd != NULL) { + /* Don't complain verbosely if we've not been passed a command + * name to complain about! */ + fprintf (stderr, "Command %s not compatible with nal %s\n", + cmd, nal2name (g_nal)); + } return (0); } @@ -841,8 +845,8 @@ int jt_ptl_disconnect(int argc, char **argv) return 0; } - if (!g_nal_is_compatible (argv[0], SOCKNAL, TOENAL, 0)) - return -1; + if (!g_nal_is_compatible (NULL, SOCKNAL, TOENAL, 0)) + return 0; if (argc >= 2 && ptl_parse_nid (&nid, argv[1]) != 0) {