X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2Futil%2Fnidstrings.c;h=780a8ab1ac21fc1fe5b3aad691eb9b7e45478941;hp=94d4088848134afbdb204ff3e3c552d5e6de614d;hb=5fea36c952373c9a235be7bf57eb2e516fcb36b2;hpb=6621439c371e37268195d05fb3d6747c98c07bc5

diff --git a/libcfs/libcfs/util/nidstrings.c b/libcfs/libcfs/util/nidstrings.c
index 94d4088..780a8ab 100644
--- a/libcfs/libcfs/util/nidstrings.c
+++ b/libcfs/libcfs/util/nidstrings.c
@@ -562,6 +562,18 @@ static struct netstrfns libcfs_netstrfns[] = {
 		.nf_match_addr		= libcfs_num_match,
 		.nf_min_max		= cfs_num_min_max,
 		.nf_expand_addrrange	= libcfs_num_addr_range_expand
+	},
+	{
+		.nf_type		= KFILND,
+		.nf_name		= "kfi",
+		.nf_modname		= "kkfilnd",
+		.nf_addr2str		= libcfs_decnum_addr2str,
+		.nf_str2addr		= libcfs_num_str2addr,
+		.nf_parse_addrlist	= libcfs_num_parse,
+		.nf_print_addrlist	= libcfs_num_addr_range_print,
+		.nf_match_addr		= libcfs_num_match,
+		.nf_min_max		= cfs_num_min_max,
+		.nf_expand_addrrange	= libcfs_num_addr_range_expand
 	}
 };
 
@@ -1229,19 +1241,6 @@ int cfs_match_nid(lnet_nid_t nid, struct list_head *nidlist)
 	return 0;
 }
 
-static struct netstrfns *
-type2net_info(__u32 net_type)
-{
-	int i;
-
-	for (i = 0; i < libcfs_nnetstrfns; i++) {
-		if (libcfs_netstrfns[i].nf_type == net_type)
-			return &libcfs_netstrfns[i];
-	}
-
-	return NULL;
-}
-
 int
 cfs_match_net(__u32 net_id, __u32 net_type, struct list_head *net_num_list)
 {
@@ -1270,30 +1269,6 @@ cfs_match_net(__u32 net_id, __u32 net_type, struct list_head *net_num_list)
 	return 1;
 }
 
-int
-cfs_match_nid_net(lnet_nid_t nid, __u32 net_type,
-		  struct list_head *net_num_list,
-		  struct list_head *addr)
-{
-	__u32 address;
-	struct netstrfns *fns;
-
-	if (!addr || !net_num_list)
-		return 0;
-
-	fns = type2net_info(LNET_NETTYP(LNET_NIDNET(nid)));
-	if (!fns || !net_num_list || !addr)
-		return 0;
-
-	address = LNET_NIDADDR(nid);
-
-	/* if either the address or net number don't match then no match */
-	if (!fns->nf_match_addr(address, addr) ||
-	    !cfs_match_net(LNET_NIDNET(nid), net_type, net_num_list))
-		return 0;
-
-	return 1;
-}
 /**
  * Print the network part of the nidrange \a nr into the specified \a buffer.
  *