staging: lustre: Avoid nid range related forward declarations in nidstring.c
authorJames Simmons <jsimmons@infradead.org>
Thu, 22 Oct 2015 01:52:45 +0000 (21:52 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Oct 2015 01:52:21 +0000 (18:52 -0700)
Since forward declarations are frowned on upstream we move
the NID range handling to near the start of the nidstring.c
file.

Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: http://review.whamcloud.com/15086
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6245
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lnet/lnet/nidstrings.c

index a02c1f664f952fa80afcdcb9cfaa8218d544bcc7..1874dfebe33fe20e6f1a9554c40e1dc181e30e97 100644 (file)
@@ -63,6 +63,8 @@ static int       libcfs_nidstring_idx;
 
 static DEFINE_SPINLOCK(libcfs_nidstring_lock);
 
+static struct netstrfns *libcfs_namenum2netstrfns(const char *name);
+
 char *
 libcfs_next_nidstring(void)
 {
@@ -80,149 +82,536 @@ libcfs_next_nidstring(void)
 }
 EXPORT_SYMBOL(libcfs_next_nidstring);
 
-static int libcfs_lo_str2addr(const char *str, int nob, __u32 *addr)
-{
-       *addr = 0;
-       return 1;
-}
+/**
+ * Nid range list syntax.
+ * \verbatim
+ *
+ * <nidlist>         :== <nidrange> [ ' ' <nidrange> ]
+ * <nidrange>        :== <addrrange> '@' <net>
+ * <addrrange>       :== '*' |
+ *                       <ipaddr_range> |
+ *                      <cfs_expr_list>
+ * <ipaddr_range>    :== <cfs_expr_list>.<cfs_expr_list>.<cfs_expr_list>.
+ *                      <cfs_expr_list>
+ * <cfs_expr_list>   :== <number> |
+ *                       <expr_list>
+ * <expr_list>       :== '[' <range_expr> [ ',' <range_expr>] ']'
+ * <range_expr>      :== <number> |
+ *                       <number> '-' <number> |
+ *                       <number> '-' <number> '/' <number>
+ * <net>             :== <netname> | <netname><number>
+ * <netname>         :== "lo" | "tcp" | "o2ib" | "cib" | "openib" | "iib" |
+ *                       "vib" | "ra" | "elan" | "mx" | "ptl"
+ * \endverbatim
+ */
 
-static void libcfs_ip_addr2str(__u32 addr, char *str)
-{
-       snprintf(str, LNET_NIDSTR_SIZE, "%u.%u.%u.%u",
-                (addr >> 24) & 0xff, (addr >> 16) & 0xff,
-                (addr >> 8) & 0xff, addr & 0xff);
-}
+/**
+ * Structure to represent \<nidrange\> token of the syntax.
+ *
+ * One of this is created for each \<net\> parsed.
+ */
+struct nidrange {
+       /**
+        * Link to list of this structures which is built on nid range
+        * list parsing.
+        */
+       struct list_head nr_link;
+       /**
+        * List head for addrrange::ar_link.
+        */
+       struct list_head nr_addrranges;
+       /**
+        * Flag indicating that *@<net> is found.
+        */
+       int nr_all;
+       /**
+        * Pointer to corresponding element of libcfs_netstrfns.
+        */
+       struct netstrfns *nr_netstrfns;
+       /**
+        * Number of network. E.g. 5 if \<net\> is "elan5".
+        */
+       int nr_netnum;
+};
+
+/**
+ * Structure to represent \<addrrange\> token of the syntax.
+ */
+struct addrrange {
+       /**
+        * Link to nidrange::nr_addrranges.
+        */
+       struct list_head ar_link;
+       /**
+        * List head for cfs_expr_list::el_list.
+        */
+       struct list_head ar_numaddr_ranges;
+};
 
-static int libcfs_ip_str2addr(const char *str, int nob, __u32 *addr)
+/**
+ * Parses \<addrrange\> token on the syntax.
+ *
+ * Allocates struct addrrange and links to \a nidrange via
+ * (nidrange::nr_addrranges)
+ *
+ * \retval 0 if \a src parses to '*' | \<ipaddr_range\> | \<cfs_expr_list\>
+ * \retval -errno otherwise
+ */
+static int
+parse_addrange(const struct cfs_lstr *src, struct nidrange *nidrange)
 {
-       unsigned int    a;
-       unsigned int    b;
-       unsigned int    c;
-       unsigned int    d;
-       int             n = nob; /* XscanfX */
+       struct addrrange *addrrange;
 
-       /* numeric IP? */
-       if (sscanf(str, "%u.%u.%u.%u%n", &a, &b, &c, &d, &n) >= 4 &&
-           n == nob &&
-           (a & ~0xff) == 0 && (b & ~0xff) == 0 &&
-           (c & ~0xff) == 0 && (d & ~0xff) == 0) {
-               *addr = ((a<<24)|(b<<16)|(c<<8)|d);
-               return 1;
+       if (src->ls_len == 1 && src->ls_str[0] == '*') {
+               nidrange->nr_all = 1;
+               return 0;
        }
 
-       return 0;
+       LIBCFS_ALLOC(addrrange, sizeof(struct addrrange));
+       if (addrrange == NULL)
+               return -ENOMEM;
+       list_add_tail(&addrrange->ar_link, &nidrange->nr_addrranges);
+       INIT_LIST_HEAD(&addrrange->ar_numaddr_ranges);
+
+       return nidrange->nr_netstrfns->nf_parse_addrlist(src->ls_str,
+                                               src->ls_len,
+                                               &addrrange->ar_numaddr_ranges);
 }
 
-int
-cfs_ip_addr_parse(char *str, int len, struct list_head *list)
+/**
+ * Finds or creates struct nidrange.
+ *
+ * Checks if \a src is a valid network name, looks for corresponding
+ * nidrange on the ist of nidranges (\a nidlist), creates new struct
+ * nidrange if it is not found.
+ *
+ * \retval pointer to struct nidrange matching network specified via \a src
+ * \retval NULL if \a src does not match any network
+ */
+static struct nidrange *
+add_nidrange(const struct cfs_lstr *src,
+            struct list_head *nidlist)
 {
-       struct cfs_expr_list *el;
-       struct cfs_lstr src;
-       int rc;
-       int i;
-
-       src.ls_str = str;
-       src.ls_len = len;
-       i = 0;
-
-       while (src.ls_str != NULL) {
-               struct cfs_lstr res;
-
-               if (!cfs_gettok(&src, '.', &res)) {
-                       rc = -EINVAL;
-                       goto out;
-               }
+       struct netstrfns *nf;
+       struct nidrange *nr;
+       int endlen;
+       unsigned netnum;
 
-               rc = cfs_expr_list_parse(res.ls_str, res.ls_len, 0, 255, &el);
-               if (rc != 0)
-                       goto out;
+       if (src->ls_len >= LNET_NIDSTR_SIZE)
+               return NULL;
 
-               list_add_tail(&el->el_link, list);
-               i++;
+       nf = libcfs_namenum2netstrfns(src->ls_str);
+       if (nf == NULL)
+               return NULL;
+       endlen = src->ls_len - strlen(nf->nf_name);
+       if (endlen == 0)
+               /* network name only, e.g. "elan" or "tcp" */
+               netnum = 0;
+       else {
+               /* e.g. "elan25" or "tcp23", refuse to parse if
+                * network name is not appended with decimal or
+                * hexadecimal number */
+               if (!cfs_str2num_check(src->ls_str + strlen(nf->nf_name),
+                                      endlen, &netnum, 0, MAX_NUMERIC_VALUE))
+                       return NULL;
        }
 
-       if (i == 4)
-               return 0;
-
-       rc = -EINVAL;
-out:
-       cfs_expr_list_free_list(list);
-
-       return rc;
-}
+       list_for_each_entry(nr, nidlist, nr_link) {
+               if (nr->nr_netstrfns != nf)
+                       continue;
+               if (nr->nr_netnum != netnum)
+                       continue;
+               return nr;
+       }
 
-static int
-libcfs_ip_addr_range_print(char *buffer, int count, struct list_head *list)
-{
-       int i = 0, j = 0;
-       struct cfs_expr_list *el;
+       LIBCFS_ALLOC(nr, sizeof(struct nidrange));
+       if (nr == NULL)
+               return NULL;
+       list_add_tail(&nr->nr_link, nidlist);
+       INIT_LIST_HEAD(&nr->nr_addrranges);
+       nr->nr_netstrfns = nf;
+       nr->nr_all = 0;
+       nr->nr_netnum = netnum;
 
-       list_for_each_entry(el, list, el_link) {
-               LASSERT(j++ < 4);
-               if (i != 0)
-                       i += scnprintf(buffer + i, count - i, ".");
-               i += cfs_expr_list_print(buffer + i, count - i, el);
-       }
-       return i;
+       return nr;
 }
 
 /**
- * Matches address (\a addr) against address set encoded in \a list.
+ * Parses \<nidrange\> token of the syntax.
  *
- * \retval 1 if \a addr matches
+ * \retval 1 if \a src parses to \<addrrange\> '@' \<net\>
  * \retval 0 otherwise
  */
-int
-cfs_ip_addr_match(__u32 addr, struct list_head *list)
-{
-       struct cfs_expr_list *el;
-       int i = 0;
-
-       list_for_each_entry_reverse(el, list, el_link) {
-               if (!cfs_expr_list_match(addr & 0xff, el))
-                       return 0;
-               addr >>= 8;
-               i++;
-       }
-
-       return i == 4;
-}
-
-static void libcfs_decnum_addr2str(__u32 addr, char *str)
-{
-       snprintf(str, LNET_NIDSTR_SIZE, "%u", addr);
-}
-
-static void libcfs_hexnum_addr2str(__u32 addr, char *str)
+static int
+parse_nidrange(struct cfs_lstr *src, struct list_head *nidlist)
 {
-       snprintf(str, LNET_NIDSTR_SIZE, "0x%x", addr);
-}
+       struct cfs_lstr addrrange;
+       struct cfs_lstr net;
+       struct cfs_lstr tmp;
+       struct nidrange *nr;
 
-static int libcfs_num_str2addr(const char *str, int nob, __u32 *addr)
-{
-       int     n;
+       tmp = *src;
+       if (cfs_gettok(src, '@', &addrrange) == 0)
+               goto failed;
 
-       n = nob;
-       if (sscanf(str, "0x%x%n", addr, &n) >= 1 && n == nob)
-               return 1;
+       if (cfs_gettok(src, '@', &net) == 0 || src->ls_str != NULL)
+               goto failed;
 
-       n = nob;
-       if (sscanf(str, "0X%x%n", addr, &n) >= 1 && n == nob)
-               return 1;
+       nr = add_nidrange(&net, nidlist);
+       if (nr == NULL)
+               goto failed;
 
-       n = nob;
-       if (sscanf(str, "%u%n", addr, &n) >= 1 && n == nob)
-               return 1;
+       if (parse_addrange(&addrrange, nr) != 0)
+               goto failed;
 
+       return 1;
+failed:
+       CWARN("can't parse nidrange: \"%.*s\"\n", tmp.ls_len, tmp.ls_str);
        return 0;
 }
 
 /**
- * Nf_parse_addrlist method for networks using numeric addresses.
+ * Frees addrrange structures of \a list.
  *
- * Examples of such networks are gm and elan.
+ * For each struct addrrange structure found on \a list it frees
+ * cfs_expr_list list attached to it and frees the addrrange itself.
  *
- * \retval 0 if \a str parsed to numeric address
+ * \retval none
+ */
+static void
+free_addrranges(struct list_head *list)
+{
+       while (!list_empty(list)) {
+               struct addrrange *ar;
+
+               ar = list_entry(list->next, struct addrrange, ar_link);
+
+               cfs_expr_list_free_list(&ar->ar_numaddr_ranges);
+               list_del(&ar->ar_link);
+               LIBCFS_FREE(ar, sizeof(struct addrrange));
+       }
+}
+
+/**
+ * Frees nidrange strutures of \a list.
+ *
+ * For each struct nidrange structure found on \a list it frees
+ * addrrange list attached to it and frees the nidrange itself.
+ *
+ * \retval none
+ */
+void
+cfs_free_nidlist(struct list_head *list)
+{
+       struct list_head *pos, *next;
+       struct nidrange *nr;
+
+       list_for_each_safe(pos, next, list) {
+               nr = list_entry(pos, struct nidrange, nr_link);
+               free_addrranges(&nr->nr_addrranges);
+               list_del(pos);
+               LIBCFS_FREE(nr, sizeof(struct nidrange));
+       }
+}
+EXPORT_SYMBOL(cfs_free_nidlist);
+
+/**
+ * Parses nid range list.
+ *
+ * Parses with rigorous syntax and overflow checking \a str into
+ * \<nidrange\> [ ' ' \<nidrange\> ], compiles \a str into set of
+ * structures and links that structure to \a nidlist. The resulting
+ * list can be used to match a NID againts set of NIDS defined by \a
+ * str.
+ * \see cfs_match_nid
+ *
+ * \retval 1 on success
+ * \retval 0 otherwise
+ */
+int
+cfs_parse_nidlist(char *str, int len, struct list_head *nidlist)
+{
+       struct cfs_lstr src;
+       struct cfs_lstr res;
+       int rc;
+
+       src.ls_str = str;
+       src.ls_len = len;
+       INIT_LIST_HEAD(nidlist);
+       while (src.ls_str) {
+               rc = cfs_gettok(&src, ' ', &res);
+               if (rc == 0) {
+                       cfs_free_nidlist(nidlist);
+                       return 0;
+               }
+               rc = parse_nidrange(&res, nidlist);
+               if (rc == 0) {
+                       cfs_free_nidlist(nidlist);
+                       return 0;
+               }
+       }
+       return 1;
+}
+EXPORT_SYMBOL(cfs_parse_nidlist);
+
+/**
+ * Matches a nid (\a nid) against the compiled list of nidranges (\a nidlist).
+ *
+ * \see cfs_parse_nidlist()
+ *
+ * \retval 1 on match
+ * \retval 0  otherwises
+ */
+int cfs_match_nid(lnet_nid_t nid, struct list_head *nidlist)
+{
+       struct nidrange *nr;
+       struct addrrange *ar;
+
+       list_for_each_entry(nr, nidlist, nr_link) {
+               if (nr->nr_netstrfns->nf_type != LNET_NETTYP(LNET_NIDNET(nid)))
+                       continue;
+               if (nr->nr_netnum != LNET_NETNUM(LNET_NIDNET(nid)))
+                       continue;
+               if (nr->nr_all)
+                       return 1;
+               list_for_each_entry(ar, &nr->nr_addrranges, ar_link)
+                       if (nr->nr_netstrfns->nf_match_addr(LNET_NIDADDR(nid),
+                                                      &ar->ar_numaddr_ranges))
+                               return 1;
+       }
+       return 0;
+}
+EXPORT_SYMBOL(cfs_match_nid);
+
+/**
+ * Print the network part of the nidrange \a nr into the specified \a buffer.
+ *
+ * \retval number of characters written
+ */
+static int
+cfs_print_network(char *buffer, int count, struct nidrange *nr)
+{
+       struct netstrfns *nf = nr->nr_netstrfns;
+
+       if (nr->nr_netnum == 0)
+               return scnprintf(buffer, count, "@%s", nf->nf_name);
+       else
+               return scnprintf(buffer, count, "@%s%u",
+                                nf->nf_name, nr->nr_netnum);
+}
+
+/**
+ * Print a list of addrrange (\a addrranges) into the specified \a buffer.
+ * At max \a count characters can be printed into \a buffer.
+ *
+ * \retval number of characters written
+ */
+static int
+cfs_print_addrranges(char *buffer, int count, struct list_head *addrranges,
+                    struct nidrange *nr)
+{
+       int i = 0;
+       struct addrrange *ar;
+       struct netstrfns *nf = nr->nr_netstrfns;
+
+       list_for_each_entry(ar, addrranges, ar_link) {
+               if (i != 0)
+                       i += scnprintf(buffer + i, count - i, " ");
+               i += nf->nf_print_addrlist(buffer + i, count - i,
+                                          &ar->ar_numaddr_ranges);
+               i += cfs_print_network(buffer + i, count - i, nr);
+       }
+       return i;
+}
+
+/**
+ * Print a list of nidranges (\a nidlist) into the specified \a buffer.
+ * At max \a count characters can be printed into \a buffer.
+ * Nidranges are separated by a space character.
+ *
+ * \retval number of characters written
+ */
+int cfs_print_nidlist(char *buffer, int count, struct list_head *nidlist)
+{
+       int i = 0;
+       struct nidrange *nr;
+
+       if (count <= 0)
+               return 0;
+
+       list_for_each_entry(nr, nidlist, nr_link) {
+               if (i != 0)
+                       i += scnprintf(buffer + i, count - i, " ");
+
+               if (nr->nr_all != 0) {
+                       LASSERT(list_empty(&nr->nr_addrranges));
+                       i += scnprintf(buffer + i, count - i, "*");
+                       i += cfs_print_network(buffer + i, count - i, nr);
+               } else {
+                       i += cfs_print_addrranges(buffer + i, count - i,
+                                                 &nr->nr_addrranges, nr);
+               }
+       }
+       return i;
+}
+EXPORT_SYMBOL(cfs_print_nidlist);
+
+static int
+libcfs_lo_str2addr(const char *str, int nob, __u32 *addr)
+{
+       *addr = 0;
+       return 1;
+}
+
+static void
+libcfs_ip_addr2str(__u32 addr, char *str)
+{
+       snprintf(str, LNET_NIDSTR_SIZE, "%u.%u.%u.%u",
+                (addr >> 24) & 0xff, (addr >> 16) & 0xff,
+                (addr >> 8) & 0xff, addr & 0xff);
+}
+
+/* CAVEAT EMPTOR XscanfX
+ * I use "%n" at the end of a sscanf format to detect trailing junk.  However
+ * sscanf may return immediately if it sees the terminating '0' in a string, so
+ * I initialise the %n variable to the expected length.  If sscanf sets it;
+ * fine, if it doesn't, then the scan ended at the end of the string, which is
+ * fine too :) */
+static int
+libcfs_ip_str2addr(const char *str, int nob, __u32 *addr)
+{
+       unsigned int    a;
+       unsigned int    b;
+       unsigned int    c;
+       unsigned int    d;
+       int             n = nob; /* XscanfX */
+
+       /* numeric IP? */
+       if (sscanf(str, "%u.%u.%u.%u%n", &a, &b, &c, &d, &n) >= 4 &&
+           n == nob &&
+           (a & ~0xff) == 0 && (b & ~0xff) == 0 &&
+           (c & ~0xff) == 0 && (d & ~0xff) == 0) {
+               *addr = ((a<<24)|(b<<16)|(c<<8)|d);
+               return 1;
+       }
+
+       return 0;
+}
+
+/* Used by lnet/config.c so it can't be static */
+int
+cfs_ip_addr_parse(char *str, int len, struct list_head *list)
+{
+       struct cfs_expr_list *el;
+       struct cfs_lstr src;
+       int rc;
+       int i;
+
+       src.ls_str = str;
+       src.ls_len = len;
+       i = 0;
+
+       while (src.ls_str != NULL) {
+               struct cfs_lstr res;
+
+               if (!cfs_gettok(&src, '.', &res)) {
+                       rc = -EINVAL;
+                       goto out;
+               }
+
+               rc = cfs_expr_list_parse(res.ls_str, res.ls_len, 0, 255, &el);
+               if (rc != 0)
+                       goto out;
+
+               list_add_tail(&el->el_link, list);
+               i++;
+       }
+
+       if (i == 4)
+               return 0;
+
+       rc = -EINVAL;
+out:
+       cfs_expr_list_free_list(list);
+
+       return rc;
+}
+
+static int
+libcfs_ip_addr_range_print(char *buffer, int count, struct list_head *list)
+{
+       int i = 0, j = 0;
+       struct cfs_expr_list *el;
+
+       list_for_each_entry(el, list, el_link) {
+               LASSERT(j++ < 4);
+               if (i != 0)
+                       i += scnprintf(buffer + i, count - i, ".");
+               i += cfs_expr_list_print(buffer + i, count - i, el);
+       }
+       return i;
+}
+
+/**
+ * Matches address (\a addr) against address set encoded in \a list.
+ *
+ * \retval 1 if \a addr matches
+ * \retval 0 otherwise
+ */
+int
+cfs_ip_addr_match(__u32 addr, struct list_head *list)
+{
+       struct cfs_expr_list *el;
+       int i = 0;
+
+       list_for_each_entry_reverse(el, list, el_link) {
+               if (!cfs_expr_list_match(addr & 0xff, el))
+                       return 0;
+               addr >>= 8;
+               i++;
+       }
+
+       return i == 4;
+}
+
+static void
+libcfs_decnum_addr2str(__u32 addr, char *str)
+{
+       snprintf(str, LNET_NIDSTR_SIZE, "%u", addr);
+}
+
+static void
+libcfs_hexnum_addr2str(__u32 addr, char *str)
+{
+       snprintf(str, LNET_NIDSTR_SIZE, "0x%x", addr);
+}
+
+static int
+libcfs_num_str2addr(const char *str, int nob, __u32 *addr)
+{
+       int     n;
+
+       n = nob;
+       if (sscanf(str, "0x%x%n", addr, &n) >= 1 && n == nob)
+               return 1;
+
+       n = nob;
+       if (sscanf(str, "0X%x%n", addr, &n) >= 1 && n == nob)
+               return 1;
+
+       n = nob;
+       if (sscanf(str, "%u%n", addr, &n) >= 1 && n == nob)
+               return 1;
+
+       return 0;
+}
+
+/**
+ * Nf_parse_addrlist method for networks using numeric addresses.
+ *
+ * Examples of such networks are gm and elan.
+ *
+ * \retval 0 if \a str parsed to numeric address
  * \retval errno otherwise
  */
 static int
@@ -373,632 +762,251 @@ static struct netstrfns  libcfs_netstrfns[] = {
         /* .nf_parse_addrlist*/  libcfs_num_parse,
         /* .nf_print_addrlist*/  libcfs_num_addr_range_print,
         /* .nf_match_addr*/  libcfs_num_match},
-       /* placeholder for net0 alias.  It MUST BE THE LAST ENTRY */
-       {/* .nf_type      */  -1},
-};
-
-static const int libcfs_nnetstrfns = ARRAY_SIZE(libcfs_netstrfns);
-
-/* CAVEAT EMPTOR XscanfX
- * I use "%n" at the end of a sscanf format to detect trailing junk.  However
- * sscanf may return immediately if it sees the terminating '0' in a string, so
- * I initialise the %n variable to the expected length.  If sscanf sets it;
- * fine, if it doesn't, then the scan ended at the end of the string, which is
- * fine too :) */
-
-static struct netstrfns *
-libcfs_lnd2netstrfns(int lnd)
-{
-       int    i;
-
-       if (lnd >= 0)
-               for (i = 0; i < libcfs_nnetstrfns; i++)
-                       if (lnd == libcfs_netstrfns[i].nf_type)
-                               return &libcfs_netstrfns[i];
-
-       return NULL;
-}
-
-static struct netstrfns *
-libcfs_namenum2netstrfns(const char *name)
-{
-       struct netstrfns *nf;
-       int            i;
-
-       for (i = 0; i < libcfs_nnetstrfns; i++) {
-               nf = &libcfs_netstrfns[i];
-               if (nf->nf_type >= 0 &&
-                   !strncmp(name, nf->nf_name, strlen(nf->nf_name)))
-                       return nf;
-       }
-       return NULL;
-}
-
-static struct netstrfns *
-libcfs_name2netstrfns(const char *name)
-{
-       int    i;
-
-       for (i = 0; i < libcfs_nnetstrfns; i++)
-               if (libcfs_netstrfns[i].nf_type >= 0 &&
-                   !strcmp(libcfs_netstrfns[i].nf_name, name))
-                       return &libcfs_netstrfns[i];
-
-       return NULL;
-}
-
-int
-libcfs_isknown_lnd(int type)
-{
-       return libcfs_lnd2netstrfns(type) != NULL;
-}
-EXPORT_SYMBOL(libcfs_isknown_lnd);
-
-char *
-libcfs_lnd2modname(int lnd)
-{
-       struct netstrfns *nf = libcfs_lnd2netstrfns(lnd);
-
-       return (nf == NULL) ? NULL : nf->nf_modname;
-}
-EXPORT_SYMBOL(libcfs_lnd2modname);
-
-char *
-libcfs_lnd2str(int lnd)
-{
-       char       *str;
-       struct netstrfns *nf = libcfs_lnd2netstrfns(lnd);
-
-       if (nf != NULL)
-               return nf->nf_name;
-
-       str = libcfs_next_nidstring();
-       snprintf(str, LNET_NIDSTR_SIZE, "?%d?", lnd);
-       return str;
-}
-EXPORT_SYMBOL(libcfs_lnd2str);
-
-int
-libcfs_str2lnd(const char *str)
-{
-       struct netstrfns *nf = libcfs_name2netstrfns(str);
-
-       if (nf != NULL)
-               return nf->nf_type;
-
-       return -1;
-}
-EXPORT_SYMBOL(libcfs_str2lnd);
-
-char *
-libcfs_net2str(__u32 net)
-{
-       int            lnd = LNET_NETTYP(net);
-       int            num = LNET_NETNUM(net);
-       struct netstrfns *nf  = libcfs_lnd2netstrfns(lnd);
-       char         *str = libcfs_next_nidstring();
-
-       if (nf == NULL)
-               snprintf(str, LNET_NIDSTR_SIZE, "<%d:%d>", lnd, num);
-       else if (num == 0)
-               snprintf(str, LNET_NIDSTR_SIZE, "%s", nf->nf_name);
-       else
-               snprintf(str, LNET_NIDSTR_SIZE, "%s%d", nf->nf_name, num);
-
-       return str;
-}
-EXPORT_SYMBOL(libcfs_net2str);
-
-char *
-libcfs_nid2str(lnet_nid_t nid)
-{
-       __u32        addr = LNET_NIDADDR(nid);
-       __u32        net = LNET_NIDNET(nid);
-       int            lnd = LNET_NETTYP(net);
-       int            nnum = LNET_NETNUM(net);
-       struct netstrfns *nf;
-       char         *str;
-       int            nob;
-
-       if (nid == LNET_NID_ANY)
-               return "<?>";
-
-       nf = libcfs_lnd2netstrfns(lnd);
-       str = libcfs_next_nidstring();
-
-       if (nf == NULL)
-               snprintf(str, LNET_NIDSTR_SIZE, "%x@<%d:%d>", addr, lnd, nnum);
-       else {
-               nf->nf_addr2str(addr, str);
-               nob = strlen(str);
-               if (nnum == 0)
-                       snprintf(str + nob, LNET_NIDSTR_SIZE - nob, "@%s",
-                                nf->nf_name);
-               else
-                       snprintf(str + nob, LNET_NIDSTR_SIZE - nob, "@%s%d",
-                                nf->nf_name, nnum);
-       }
-
-       return str;
-}
-EXPORT_SYMBOL(libcfs_nid2str);
-
-static struct netstrfns *
-libcfs_str2net_internal(const char *str, __u32 *net)
-{
-       struct netstrfns *uninitialized_var(nf);
-       int            nob;
-       unsigned int   netnum;
-       int            i;
-
-       for (i = 0; i < libcfs_nnetstrfns; i++) {
-               nf = &libcfs_netstrfns[i];
-               if (nf->nf_type >= 0 &&
-                   !strncmp(str, nf->nf_name, strlen(nf->nf_name)))
-                       break;
-       }
-
-       if (i == libcfs_nnetstrfns)
-               return NULL;
-
-       nob = strlen(nf->nf_name);
-
-       if (strlen(str) == (unsigned int)nob) {
-               netnum = 0;
-       } else {
-               if (nf->nf_type == LOLND) /* net number not allowed */
-                       return NULL;
-
-               str += nob;
-               i = strlen(str);
-               if (sscanf(str, "%u%n", &netnum, &i) < 1 ||
-                   i != (int)strlen(str))
-                       return NULL;
-       }
-
-       *net = LNET_MKNET(nf->nf_type, netnum);
-       return nf;
-}
-
-__u32
-libcfs_str2net(const char *str)
-{
-       __u32  net;
-
-       if (libcfs_str2net_internal(str, &net) != NULL)
-               return net;
-
-       return LNET_NIDNET(LNET_NID_ANY);
-}
-EXPORT_SYMBOL(libcfs_str2net);
-
-lnet_nid_t
-libcfs_str2nid(const char *str)
-{
-       const char       *sep = strchr(str, '@');
-       struct netstrfns *nf;
-       __u32        net;
-       __u32        addr;
-
-       if (sep != NULL) {
-               nf = libcfs_str2net_internal(sep + 1, &net);
-               if (nf == NULL)
-                       return LNET_NID_ANY;
-       } else {
-               sep = str + strlen(str);
-               net = LNET_MKNET(SOCKLND, 0);
-               nf = libcfs_lnd2netstrfns(SOCKLND);
-               LASSERT(nf != NULL);
-       }
-
-       if (!nf->nf_str2addr(str, (int)(sep - str), &addr))
-               return LNET_NID_ANY;
-
-       return LNET_MKNID(net, addr);
-}
-EXPORT_SYMBOL(libcfs_str2nid);
-
-char *
-libcfs_id2str(lnet_process_id_t id)
-{
-       char *str = libcfs_next_nidstring();
-
-       if (id.pid == LNET_PID_ANY) {
-               snprintf(str, LNET_NIDSTR_SIZE,
-                        "LNET_PID_ANY-%s", libcfs_nid2str(id.nid));
-               return str;
-       }
+       /* placeholder for net0 alias.  It MUST BE THE LAST ENTRY */
+       {/* .nf_type      */  -1},
+};
 
-       snprintf(str, LNET_NIDSTR_SIZE, "%s%u-%s",
-                ((id.pid & LNET_PID_USERFLAG) != 0) ? "U" : "",
-                (id.pid & ~LNET_PID_USERFLAG), libcfs_nid2str(id.nid));
-       return str;
-}
-EXPORT_SYMBOL(libcfs_id2str);
+static const int libcfs_nnetstrfns = ARRAY_SIZE(libcfs_netstrfns);
 
-int
-libcfs_str2anynid(lnet_nid_t *nidp, const char *str)
+static struct netstrfns *
+libcfs_lnd2netstrfns(int lnd)
 {
-       if (!strcmp(str, "*")) {
-               *nidp = LNET_NID_ANY;
-               return 1;
-       }
-
-       *nidp = libcfs_str2nid(str);
-       return *nidp != LNET_NID_ANY;
-}
-EXPORT_SYMBOL(libcfs_str2anynid);
-
-/**
- * Nid range list syntax.
- * \verbatim
- *
- * <nidlist>    :== <nidrange> [ ' ' <nidrange> ]
- * <nidrange>  :== <addrrange> '@' <net>
- * <addrrange>       :== '*' |
- *                    <ipaddr_range> |
- *                      <cfs_expr_list>
- * <ipaddr_range>    :== <cfs_expr_list>.<cfs_expr_list>.<cfs_expr_list>.
- *                      <cfs_expr_list>
- * <cfs_expr_list>   :== <number> |
- *                    <expr_list>
- * <expr_list>       :== '[' <range_expr> [ ',' <range_expr>] ']'
- * <range_expr>      :== <number> |
- *                    <number> '-' <number> |
- *                    <number> '-' <number> '/' <number>
- * <net>            :== <netname> | <netname><number>
- * <netname>    :== "lo" | "tcp" | "o2ib" | "cib" | "openib" | "iib" |
- *                    "vib" | "ra" | "elan" | "mx" | "ptl"
- * \endverbatim
- */
+       int    i;
 
-/**
- * Structure to represent \<nidrange\> token of the syntax.
- *
- * One of this is created for each \<net\> parsed.
- */
-struct nidrange {
-       /**
-        * Link to list of this structures which is built on nid range
-        * list parsing.
-        */
-       struct list_head nr_link;
-       /**
-        * List head for addrrange::ar_link.
-        */
-       struct list_head nr_addrranges;
-       /**
-        * Flag indicating that *@<net> is found.
-        */
-       int nr_all;
-       /**
-        * Pointer to corresponding element of libcfs_netstrfns.
-        */
-       struct netstrfns *nr_netstrfns;
-       /**
-        * Number of network. E.g. 5 if \<net\> is "elan5".
-        */
-       int nr_netnum;
-};
+       if (lnd >= 0)
+               for (i = 0; i < libcfs_nnetstrfns; i++)
+                       if (lnd == libcfs_netstrfns[i].nf_type)
+                               return &libcfs_netstrfns[i];
 
-/**
- * Structure to represent \<addrrange\> token of the syntax.
- */
-struct addrrange {
-       /**
-        * Link to nidrange::nr_addrranges.
-        */
-       struct list_head ar_link;
-       /**
-        * List head for cfs_expr_list::el_list.
-        */
-       struct list_head ar_numaddr_ranges;
-};
+       return NULL;
+}
 
-/**
- * Parses \<addrrange\> token on the syntax.
- *
- * Allocates struct addrrange and links to \a nidrange via
- * (nidrange::nr_addrranges)
- *
- * \retval 0 if \a src parses to '*' | \<ipaddr_range\> | \<cfs_expr_list\>
- * \retval -errno otherwise
- */
-static int
-parse_addrange(const struct cfs_lstr *src, struct nidrange *nidrange)
+static struct netstrfns *
+libcfs_namenum2netstrfns(const char *name)
 {
-       struct addrrange *addrrange;
+       struct netstrfns *nf;
+       int            i;
 
-       if (src->ls_len == 1 && src->ls_str[0] == '*') {
-               nidrange->nr_all = 1;
-               return 0;
+       for (i = 0; i < libcfs_nnetstrfns; i++) {
+               nf = &libcfs_netstrfns[i];
+               if (nf->nf_type >= 0 &&
+                   !strncmp(name, nf->nf_name, strlen(nf->nf_name)))
+                       return nf;
        }
-
-       LIBCFS_ALLOC(addrrange, sizeof(struct addrrange));
-       if (addrrange == NULL)
-               return -ENOMEM;
-       list_add_tail(&addrrange->ar_link, &nidrange->nr_addrranges);
-       INIT_LIST_HEAD(&addrrange->ar_numaddr_ranges);
-
-       return nidrange->nr_netstrfns->nf_parse_addrlist(src->ls_str,
-                                               src->ls_len,
-                                               &addrrange->ar_numaddr_ranges);
+       return NULL;
 }
 
-/**
- * Finds or creates struct nidrange.
- *
- * Checks if \a src is a valid network name, looks for corresponding
- * nidrange on the ist of nidranges (\a nidlist), creates new struct
- * nidrange if it is not found.
- *
- * \retval pointer to struct nidrange matching network specified via \a src
- * \retval NULL if \a src does not match any network
- */
-static struct nidrange *
-add_nidrange(const struct cfs_lstr *src,
-            struct list_head *nidlist)
+static struct netstrfns *
+libcfs_name2netstrfns(const char *name)
 {
-       struct netstrfns *nf;
-       struct nidrange *nr;
-       int endlen;
-       unsigned netnum;
+       int    i;
 
-       if (src->ls_len >= LNET_NIDSTR_SIZE)
-               return NULL;
+       for (i = 0; i < libcfs_nnetstrfns; i++)
+               if (libcfs_netstrfns[i].nf_type >= 0 &&
+                   !strcmp(libcfs_netstrfns[i].nf_name, name))
+                       return &libcfs_netstrfns[i];
 
-       nf = libcfs_namenum2netstrfns(src->ls_str);
-       if (nf == NULL)
-               return NULL;
-       endlen = src->ls_len - strlen(nf->nf_name);
-       if (endlen == 0)
-               /* network name only, e.g. "elan" or "tcp" */
-               netnum = 0;
-       else {
-               /* e.g. "elan25" or "tcp23", refuse to parse if
-                * network name is not appended with decimal or
-                * hexadecimal number */
-               if (!cfs_str2num_check(src->ls_str + strlen(nf->nf_name),
-                                      endlen, &netnum, 0, MAX_NUMERIC_VALUE))
-                       return NULL;
-       }
+       return NULL;
+}
 
-       list_for_each_entry(nr, nidlist, nr_link) {
-               if (nr->nr_netstrfns != nf)
-                       continue;
-               if (nr->nr_netnum != netnum)
-                       continue;
-               return nr;
-       }
+int
+libcfs_isknown_lnd(int type)
+{
+       return libcfs_lnd2netstrfns(type) != NULL;
+}
+EXPORT_SYMBOL(libcfs_isknown_lnd);
 
-       LIBCFS_ALLOC(nr, sizeof(struct nidrange));
-       if (nr == NULL)
-               return NULL;
-       list_add_tail(&nr->nr_link, nidlist);
-       INIT_LIST_HEAD(&nr->nr_addrranges);
-       nr->nr_netstrfns = nf;
-       nr->nr_all = 0;
-       nr->nr_netnum = netnum;
+char *
+libcfs_lnd2modname(int lnd)
+{
+       struct netstrfns *nf = libcfs_lnd2netstrfns(lnd);
 
-       return nr;
+       return (nf == NULL) ? NULL : nf->nf_modname;
 }
+EXPORT_SYMBOL(libcfs_lnd2modname);
 
-/**
- * Parses \<nidrange\> token of the syntax.
- *
- * \retval 1 if \a src parses to \<addrrange\> '@' \<net\>
- * \retval 0 otherwise
- */
-static int
-parse_nidrange(struct cfs_lstr *src, struct list_head *nidlist)
+char *
+libcfs_lnd2str(int lnd)
 {
-       struct cfs_lstr addrrange;
-       struct cfs_lstr net;
-       struct cfs_lstr tmp;
-       struct nidrange *nr;
+       char       *str;
+       struct netstrfns *nf = libcfs_lnd2netstrfns(lnd);
 
-       tmp = *src;
-       if (cfs_gettok(src, '@', &addrrange) == 0)
-               goto failed;
+       if (nf != NULL)
+               return nf->nf_name;
 
-       if (cfs_gettok(src, '@', &net) == 0 || src->ls_str != NULL)
-               goto failed;
+       str = libcfs_next_nidstring();
+       snprintf(str, LNET_NIDSTR_SIZE, "?%d?", lnd);
+       return str;
+}
+EXPORT_SYMBOL(libcfs_lnd2str);
 
-       nr = add_nidrange(&net, nidlist);
-       if (nr == NULL)
-               goto failed;
+int
+libcfs_str2lnd(const char *str)
+{
+       struct netstrfns *nf = libcfs_name2netstrfns(str);
 
-       if (parse_addrange(&addrrange, nr) != 0)
-               goto failed;
+       if (nf != NULL)
+               return nf->nf_type;
 
-       return 1;
- failed:
-       CWARN("can't parse nidrange: \"%.*s\"\n", tmp.ls_len, tmp.ls_str);
-       return 0;
+       return -1;
 }
+EXPORT_SYMBOL(libcfs_str2lnd);
 
-/**
- * Frees addrrange structures of \a list.
- *
- * For each struct addrrange structure found on \a list it frees
- * cfs_expr_list list attached to it and frees the addrrange itself.
- *
- * \retval none
- */
-static void
-free_addrranges(struct list_head *list)
+char *
+libcfs_net2str(__u32 net)
 {
-       while (!list_empty(list)) {
-               struct addrrange *ar;
+       int            lnd = LNET_NETTYP(net);
+       int            num = LNET_NETNUM(net);
+       struct netstrfns *nf  = libcfs_lnd2netstrfns(lnd);
+       char         *str = libcfs_next_nidstring();
 
-               ar = list_entry(list->next, struct addrrange, ar_link);
+       if (nf == NULL)
+               snprintf(str, LNET_NIDSTR_SIZE, "<%d:%d>", lnd, num);
+       else if (num == 0)
+               snprintf(str, LNET_NIDSTR_SIZE, "%s", nf->nf_name);
+       else
+               snprintf(str, LNET_NIDSTR_SIZE, "%s%d", nf->nf_name, num);
 
-               cfs_expr_list_free_list(&ar->ar_numaddr_ranges);
-               list_del(&ar->ar_link);
-               LIBCFS_FREE(ar, sizeof(struct addrrange));
-       }
+       return str;
 }
+EXPORT_SYMBOL(libcfs_net2str);
 
-/**
- * Frees nidrange strutures of \a list.
- *
- * For each struct nidrange structure found on \a list it frees
- * addrrange list attached to it and frees the nidrange itself.
- *
- * \retval none
- */
-void
-cfs_free_nidlist(struct list_head *list)
+char *
+libcfs_nid2str(lnet_nid_t nid)
 {
-       struct list_head *pos, *next;
-       struct nidrange *nr;
+       __u32        addr = LNET_NIDADDR(nid);
+       __u32        net = LNET_NIDNET(nid);
+       int            lnd = LNET_NETTYP(net);
+       int            nnum = LNET_NETNUM(net);
+       struct netstrfns *nf;
+       char         *str;
+       int            nob;
 
-       list_for_each_safe(pos, next, list) {
-               nr = list_entry(pos, struct nidrange, nr_link);
-               free_addrranges(&nr->nr_addrranges);
-               list_del(pos);
-               LIBCFS_FREE(nr, sizeof(struct nidrange));
+       if (nid == LNET_NID_ANY)
+               return "<?>";
+
+       nf = libcfs_lnd2netstrfns(lnd);
+       str = libcfs_next_nidstring();
+
+       if (nf == NULL)
+               snprintf(str, LNET_NIDSTR_SIZE, "%x@<%d:%d>", addr, lnd, nnum);
+       else {
+               nf->nf_addr2str(addr, str);
+               nob = strlen(str);
+               if (nnum == 0)
+                       snprintf(str + nob, LNET_NIDSTR_SIZE - nob, "@%s",
+                                nf->nf_name);
+               else
+                       snprintf(str + nob, LNET_NIDSTR_SIZE - nob, "@%s%d",
+                                nf->nf_name, nnum);
        }
+
+       return str;
 }
-EXPORT_SYMBOL(cfs_free_nidlist);
+EXPORT_SYMBOL(libcfs_nid2str);
 
-/**
- * Parses nid range list.
- *
- * Parses with rigorous syntax and overflow checking \a str into
- * \<nidrange\> [ ' ' \<nidrange\> ], compiles \a str into set of
- * structures and links that structure to \a nidlist. The resulting
- * list can be used to match a NID againts set of NIDS defined by \a
- * str.
- * \see cfs_match_nid
- *
- * \retval 1 on success
- * \retval 0 otherwise
- */
-int
-cfs_parse_nidlist(char *str, int len, struct list_head *nidlist)
+static struct netstrfns *
+libcfs_str2net_internal(const char *str, __u32 *net)
 {
-       struct cfs_lstr src;
-       struct cfs_lstr res;
-       int rc;
+       struct netstrfns *uninitialized_var(nf);
+       int            nob;
+       unsigned int   netnum;
+       int            i;
 
-       src.ls_str = str;
-       src.ls_len = len;
-       INIT_LIST_HEAD(nidlist);
-       while (src.ls_str) {
-               rc = cfs_gettok(&src, ' ', &res);
-               if (rc == 0) {
-                       cfs_free_nidlist(nidlist);
-                       return 0;
-               }
-               rc = parse_nidrange(&res, nidlist);
-               if (rc == 0) {
-                       cfs_free_nidlist(nidlist);
-                       return 0;
-               }
+       for (i = 0; i < libcfs_nnetstrfns; i++) {
+               nf = &libcfs_netstrfns[i];
+               if (nf->nf_type >= 0 &&
+                   !strncmp(str, nf->nf_name, strlen(nf->nf_name)))
+                       break;
        }
-       return 1;
-}
-EXPORT_SYMBOL(cfs_parse_nidlist);
 
-/**
- * Matches a nid (\a nid) against the compiled list of nidranges (\a nidlist).
- *
- * \see cfs_parse_nidlist()
- *
- * \retval 1 on match
- * \retval 0  otherwises
- */
-int cfs_match_nid(lnet_nid_t nid, struct list_head *nidlist)
-{
-       struct nidrange *nr;
-       struct addrrange *ar;
+       if (i == libcfs_nnetstrfns)
+               return NULL;
 
-       list_for_each_entry(nr, nidlist, nr_link) {
-               if (nr->nr_netstrfns->nf_type != LNET_NETTYP(LNET_NIDNET(nid)))
-                       continue;
-               if (nr->nr_netnum != LNET_NETNUM(LNET_NIDNET(nid)))
-                       continue;
-               if (nr->nr_all)
-                       return 1;
-               list_for_each_entry(ar, &nr->nr_addrranges, ar_link)
-                       if (nr->nr_netstrfns->nf_match_addr(LNET_NIDADDR(nid),
-                                                      &ar->ar_numaddr_ranges))
-                               return 1;
+       nob = strlen(nf->nf_name);
+
+       if (strlen(str) == (unsigned int)nob) {
+               netnum = 0;
+       } else {
+               if (nf->nf_type == LOLND) /* net number not allowed */
+                       return NULL;
+
+               str += nob;
+               i = strlen(str);
+               if (sscanf(str, "%u%n", &netnum, &i) < 1 ||
+                   i != (int)strlen(str))
+                       return NULL;
        }
-       return 0;
+
+       *net = LNET_MKNET(nf->nf_type, netnum);
+       return nf;
 }
-EXPORT_SYMBOL(cfs_match_nid);
 
-/**
- * Print the network part of the nidrange \a nr into the specified \a buffer.
- *
- * \retval number of characters written
- */
-static int
-cfs_print_network(char *buffer, int count, struct nidrange *nr)
+__u32
+libcfs_str2net(const char *str)
 {
-       struct netstrfns *nf = nr->nr_netstrfns;
+       __u32  net;
 
-       if (nr->nr_netnum == 0)
-               return scnprintf(buffer, count, "@%s", nf->nf_name);
-       else
-               return scnprintf(buffer, count, "@%s%u",
-                                nf->nf_name, nr->nr_netnum);
+       if (libcfs_str2net_internal(str, &net) != NULL)
+               return net;
+
+       return LNET_NIDNET(LNET_NID_ANY);
 }
+EXPORT_SYMBOL(libcfs_str2net);
 
-/**
- * Print a list of addrrange (\a addrranges) into the specified \a buffer.
- * At max \a count characters can be printed into \a buffer.
- *
- * \retval number of characters written
- */
-static int
-cfs_print_addrranges(char *buffer, int count, struct list_head *addrranges,
-                    struct nidrange *nr)
+lnet_nid_t
+libcfs_str2nid(const char *str)
 {
-       int i = 0;
-       struct addrrange *ar;
-       struct netstrfns *nf = nr->nr_netstrfns;
+       const char       *sep = strchr(str, '@');
+       struct netstrfns *nf;
+       __u32        net;
+       __u32        addr;
 
-       list_for_each_entry(ar, addrranges, ar_link) {
-               if (i != 0)
-                       i += scnprintf(buffer + i, count - i, " ");
-               i += nf->nf_print_addrlist(buffer + i, count - i,
-                                          &ar->ar_numaddr_ranges);
-               i += cfs_print_network(buffer + i, count - i, nr);
+       if (sep != NULL) {
+               nf = libcfs_str2net_internal(sep + 1, &net);
+               if (nf == NULL)
+                       return LNET_NID_ANY;
+       } else {
+               sep = str + strlen(str);
+               net = LNET_MKNET(SOCKLND, 0);
+               nf = libcfs_lnd2netstrfns(SOCKLND);
+               LASSERT(nf != NULL);
        }
-       return i;
+
+       if (!nf->nf_str2addr(str, (int)(sep - str), &addr))
+               return LNET_NID_ANY;
+
+       return LNET_MKNID(net, addr);
 }
+EXPORT_SYMBOL(libcfs_str2nid);
 
-/**
- * Print a list of nidranges (\a nidlist) into the specified \a buffer.
- * At max \a count characters can be printed into \a buffer.
- * Nidranges are separated by a space character.
- *
- * \retval number of characters written
- */
-int cfs_print_nidlist(char *buffer, int count, struct list_head *nidlist)
+char *
+libcfs_id2str(lnet_process_id_t id)
 {
-       int i = 0;
-       struct nidrange *nr;
+       char *str = libcfs_next_nidstring();
 
-       if (count <= 0)
-               return 0;
+       if (id.pid == LNET_PID_ANY) {
+               snprintf(str, LNET_NIDSTR_SIZE,
+                        "LNET_PID_ANY-%s", libcfs_nid2str(id.nid));
+               return str;
+       }
 
-       list_for_each_entry(nr, nidlist, nr_link) {
-               if (i != 0)
-                       i += scnprintf(buffer + i, count - i, " ");
+       snprintf(str, LNET_NIDSTR_SIZE, "%s%u-%s",
+                ((id.pid & LNET_PID_USERFLAG) != 0) ? "U" : "",
+                (id.pid & ~LNET_PID_USERFLAG), libcfs_nid2str(id.nid));
+       return str;
+}
+EXPORT_SYMBOL(libcfs_id2str);
 
-               if (nr->nr_all != 0) {
-                       LASSERT(list_empty(&nr->nr_addrranges));
-                       i += scnprintf(buffer + i, count - i, "*");
-                       i += cfs_print_network(buffer + i, count - i, nr);
-               } else {
-                       i += cfs_print_addrranges(buffer + i, count - i,
-                                                 &nr->nr_addrranges, nr);
-               }
+int
+libcfs_str2anynid(lnet_nid_t *nidp, const char *str)
+{
+       if (!strcmp(str, "*")) {
+               *nidp = LNET_NID_ANY;
+               return 1;
        }
-       return i;
+
+       *nidp = libcfs_str2nid(str);
+       return *nidp != LNET_NID_ANY;
 }
-EXPORT_SYMBOL(cfs_print_nidlist);
+EXPORT_SYMBOL(libcfs_str2anynid);