Commit c1af01da authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: move cfs_ip_addr_* function from kernel libcfs to LNet 



Both of cfs_ip_addr_parse and cfs_ip_addr_match which are located in
libcfs kernel module are used only for LNet so move this into the
nidstring handling code where it belongs. Also create user land
versions of these functions in the libcfs user land library.

Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6245
Reviewed-on: http://review.whamcloud.com/15085


Reviewed-by: default avatarBob Glossman <bob.glossman@intel.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarfrank zago <fzago@cray.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 00e27ff1

drivers/staging/lustre/include/linux/libcfs/libcfs_string.h

+0 −2
Original line number Diff line number Diff line
@@ -100,7 +100,5 @@ void cfs_expr_list_free(struct cfs_expr_list *expr_list); 
int cfs_expr_list_parse(char *str, int len, unsigned min, unsigned max,

			struct cfs_expr_list **elpp);

void cfs_expr_list_free_list(struct list_head *list);

int cfs_ip_addr_parse(char *str, int len, struct list_head *list);

int cfs_ip_addr_match(__u32 addr, struct list_head *list);



#endif

drivers/staging/lustre/include/linux/lnet/nidstr.h

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ int cfs_parse_nidlist(char *str, int len, struct list_head *list); 
int cfs_print_nidlist(char *buffer, int count, struct list_head *list);

int cfs_match_nid(lnet_nid_t nid, struct list_head *list);



int cfs_ip_addr_parse(char *str, int len, struct list_head *list);

int cfs_ip_addr_match(__u32 addr, struct list_head *list);

bool cfs_nidrange_is_contiguous(struct list_head *nidlist);

void cfs_nidrange_find_min_max(struct list_head *nidlist, char *min_nid,

			       char *max_nid, size_t nidstr_length);

drivers/staging/lustre/lnet/lnet/nidstrings.c

+60 −0
Original line number Diff line number Diff line
@@ -113,6 +113,44 @@ static int libcfs_ip_str2addr(const char *str, int nob, __u32 *addr) 
	return 0;

}



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)

{
@@ -128,6 +166,28 @@ libcfs_ip_addr_range_print(char *buffer, int count, struct list_head *list) 
	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);

drivers/staging/lustre/lustre/libcfs/libcfs_string.c

+0 −62
Original line number Diff line number Diff line
@@ -562,65 +562,3 @@ cfs_expr_list_free_list(struct list_head *list) 
	}

}

EXPORT_SYMBOL(cfs_expr_list_free_list);
 


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;

}

EXPORT_SYMBOL(cfs_ip_addr_parse);



/**

 * 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;

}

EXPORT_SYMBOL(cfs_ip_addr_match);

CRA Git | Maintained and supported by SUSTech CRA and CCSE