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

staging: lustre: move struct netstrfns to nidstr.h 



The reason struct netstrfns exist in nidstrings.c
was to avoid forward decleration errors. The best
way to handle this instead is to move this structure
to a header file. Since this structure is used in
the userland utilities as well so we place it in
nidstr.h which is exposed to userland.

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/15083


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

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

+13 −0
Original line number Diff line number Diff line
@@ -76,4 +76,17 @@ 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);



struct netstrfns {

	int	nf_type;

	char	*nf_name;

	char	*nf_modname;

	void	(*nf_addr2str)(__u32 addr, char *str);

	int	(*nf_str2addr)(const char *str, int nob, __u32 *addr);

	int	(*nf_parse_addrlist)(char *str, int len,

				     struct list_head *list);

	int	(*nf_print_addrlist)(char *buffer, int count,

				     struct list_head *list);

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

};



#endif /* _LNET_NIDSTRINGS_H */

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

+0 −13
Original line number Diff line number Diff line
@@ -208,19 +208,6 @@ libcfs_num_match(__u32 addr, struct list_head *numaddr) 
	return cfs_expr_list_match(addr, el);

}



struct netstrfns {

	int	  nf_type;

	char	*nf_name;

	char	*nf_modname;

	void       (*nf_addr2str)(__u32 addr, char *str);

	int	(*nf_str2addr)(const char *str, int nob, __u32 *addr);

	int	(*nf_parse_addrlist)(char *str, int len,

					struct list_head *list);

	int	(*nf_print_addrlist)(char *buffer, int count,

				     struct list_head *list);

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

};



static struct netstrfns  libcfs_netstrfns[] = {

	{/* .nf_type      */  LOLND,

	 /* .nf_name      */  "lo",

CRA Git | Maintained and supported by SUSTech CRA and CCSE