Skip to content

L
linux
Commit a77ddf7c authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files
Options

staging: lustre: Use C99 initializers for struct netstrfns 

Update struct netstrfns to use C99 initializers.

Remove old LND types from the netstrfns table, as they are
long obsolete and shouldn't be needed even for interop anymore.
Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6210
Reviewed-on: http://review.whamcloud.com/15088Reviewed-by: default avatarfrank zago <fzago@cray.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1a1e76c0
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 137 deletions
drivers/staging/lustre/lnet/lnet/nidstrings.c
View file @ a77ddf7c
...@@ -893,12 +893,6 @@ libcfs_decnum_addr2str(__u32 addr, char *str, size_t size) ...@@ -893,12 +893,6 @@ libcfs_decnum_addr2str(__u32 addr, char *str, size_t size)
snprintf(str, size, "%u", addr); snprintf(str, size, "%u", addr);
} }
static void
libcfs_hexnum_addr2str(__u32 addr, char *str, size_t size)
{
snprintf(str, size, "0x%x", addr);
}
static int static int
libcfs_num_str2addr(const char *str, int nob, __u32 *addr) libcfs_num_str2addr(const char *str, int nob, __u32 *addr)
{ {
...@@ -971,136 +965,56 @@ libcfs_num_match(__u32 addr, struct list_head *numaddr) ...@@ -971,136 +965,56 @@ libcfs_num_match(__u32 addr, struct list_head *numaddr)
} }
static struct netstrfns libcfs_netstrfns[] = { static struct netstrfns libcfs_netstrfns[] = {
{/* .nf_type */ LOLND, { .nf_type = LOLND,
/* .nf_name */ "lo", .nf_name = "lo",
/* .nf_modname */ "klolnd", .nf_modname = "klolnd",
/* .nf_addr2str */ libcfs_decnum_addr2str, .nf_addr2str = libcfs_decnum_addr2str,
/* .nf_str2addr */ libcfs_lo_str2addr, .nf_str2addr = libcfs_lo_str2addr,
/* .nf_parse_addr*/ libcfs_num_parse, .nf_parse_addrlist = libcfs_num_parse,
/* .nf_print_addrlist*/ libcfs_num_addr_range_print, .nf_print_addrlist = libcfs_num_addr_range_print,
/* .nf_match_addr*/ libcfs_num_match, .nf_match_addr = libcfs_num_match,
/* .nf_is_contiguous */ cfs_num_is_contiguous, .nf_is_contiguous = cfs_num_is_contiguous,
/* .nf_min_max */ cfs_num_min_max}, .nf_min_max = cfs_num_min_max },
{/* .nf_type */ SOCKLND, { .nf_type = SOCKLND,
/* .nf_name */ "tcp", .nf_name = "tcp",
/* .nf_modname */ "ksocklnd", .nf_modname = "ksocklnd",
/* .nf_addr2str */ libcfs_ip_addr2str, .nf_addr2str = libcfs_ip_addr2str,
/* .nf_str2addr */ libcfs_ip_str2addr, .nf_str2addr = libcfs_ip_str2addr,
/* .nf_parse_addrlist*/ cfs_ip_addr_parse, .nf_parse_addrlist = cfs_ip_addr_parse,
/* .nf_print_addrlist*/ libcfs_ip_addr_range_print, .nf_print_addrlist = libcfs_ip_addr_range_print,
/* .nf_match_addr*/ cfs_ip_addr_match, .nf_match_addr = cfs_ip_addr_match,
/* .nf_is_contiguous */ cfs_ip_is_contiguous, .nf_is_contiguous = cfs_ip_is_contiguous,
/* .nf_min_max */ cfs_ip_min_max}, .nf_min_max = cfs_ip_min_max },
{/* .nf_type */ O2IBLND, { .nf_type = O2IBLND,
/* .nf_name */ "o2ib", .nf_name = "o2ib",
/* .nf_modname */ "ko2iblnd", .nf_modname = "ko2iblnd",
/* .nf_addr2str */ libcfs_ip_addr2str, .nf_addr2str = libcfs_ip_addr2str,
/* .nf_str2addr */ libcfs_ip_str2addr, .nf_str2addr = libcfs_ip_str2addr,
/* .nf_parse_addrlist*/ cfs_ip_addr_parse, .nf_parse_addrlist = cfs_ip_addr_parse,
/* .nf_print_addrlist*/ libcfs_ip_addr_range_print, .nf_print_addrlist = libcfs_ip_addr_range_print,
/* .nf_match_addr*/ cfs_ip_addr_match, .nf_match_addr = cfs_ip_addr_match,
/* .nf_is_contiguous */ cfs_ip_is_contiguous, .nf_is_contiguous = cfs_ip_is_contiguous,
/* .nf_min_max */ cfs_ip_min_max}, .nf_min_max = cfs_ip_min_max },
{/* .nf_type */ CIBLND, { .nf_type = GNILND,
/* .nf_name */ "cib", .nf_name = "gni",
/* .nf_modname */ "kciblnd", .nf_modname = "kgnilnd",
/* .nf_addr2str */ libcfs_ip_addr2str, .nf_addr2str = libcfs_decnum_addr2str,
/* .nf_str2addr */ libcfs_ip_str2addr, .nf_str2addr = libcfs_num_str2addr,
/* .nf_parse_addrlist*/ cfs_ip_addr_parse, .nf_parse_addrlist = libcfs_num_parse,
/* .nf_print_addrlist*/ libcfs_ip_addr_range_print, .nf_print_addrlist = libcfs_num_addr_range_print,
/* .nf_match_addr*/ cfs_ip_addr_match, .nf_match_addr = libcfs_num_match,
/* .nf_is_contiguous */ cfs_ip_is_contiguous, .nf_is_contiguous = cfs_num_is_contiguous,
/* .nf_min_max */ cfs_ip_min_max}, .nf_min_max = cfs_num_min_max },
{/* .nf_type */ OPENIBLND, { .nf_type = GNIIPLND,
/* .nf_name */ "openib", .nf_name = "gip",
/* .nf_modname */ "kopeniblnd", .nf_modname = "kgnilnd",
/* .nf_addr2str */ libcfs_ip_addr2str, .nf_addr2str = libcfs_ip_addr2str,
/* .nf_str2addr */ libcfs_ip_str2addr, .nf_str2addr = libcfs_ip_str2addr,
/* .nf_parse_addrlist*/ cfs_ip_addr_parse, .nf_parse_addrlist = cfs_ip_addr_parse,
/* .nf_print_addrlist*/ libcfs_ip_addr_range_print, .nf_print_addrlist = libcfs_ip_addr_range_print,
/* .nf_match_addr*/ cfs_ip_addr_match, .nf_match_addr = cfs_ip_addr_match,
/* .nf_is_contiguous */ cfs_ip_is_contiguous, .nf_is_contiguous = cfs_ip_is_contiguous,
/* .nf_min_max */ cfs_ip_min_max}, .nf_min_max = cfs_ip_min_max },
{/* .nf_type */ IIBLND,
/* .nf_name */ "iib",
/* .nf_modname */ "kiiblnd",
/* .nf_addr2str */ libcfs_ip_addr2str,
/* .nf_str2addr */ libcfs_ip_str2addr,
/* .nf_parse_addrlist*/ cfs_ip_addr_parse,
/* .nf_print_addrlist*/ libcfs_ip_addr_range_print,
/* .nf_match_addr*/ cfs_ip_addr_match,
/* .nf_is_contiguous */ cfs_ip_is_contiguous,
/* .nf_min_max */ cfs_ip_min_max},
{/* .nf_type */ VIBLND,
/* .nf_name */ "vib",
/* .nf_modname */ "kviblnd",
/* .nf_addr2str */ libcfs_ip_addr2str,
/* .nf_str2addr */ libcfs_ip_str2addr,
/* .nf_parse_addrlist*/ cfs_ip_addr_parse,
/* .nf_print_addrlist*/ libcfs_ip_addr_range_print,
/* .nf_match_addr*/ cfs_ip_addr_match,
/* .nf_is_contiguous */ cfs_ip_is_contiguous,
/* .nf_min_max */ cfs_ip_min_max},
{/* .nf_type */ RALND,
/* .nf_name */ "ra",
/* .nf_modname */ "kralnd",
/* .nf_addr2str */ libcfs_ip_addr2str,
/* .nf_str2addr */ libcfs_ip_str2addr,
/* .nf_parse_addrlist*/ cfs_ip_addr_parse,
/* .nf_print_addrlist*/ libcfs_ip_addr_range_print,
/* .nf_match_addr*/ cfs_ip_addr_match,
/* .nf_is_contiguous */ cfs_ip_is_contiguous,
/* .nf_min_max */ cfs_ip_min_max},
{/* .nf_type */ QSWLND,
/* .nf_name */ "elan",
/* .nf_modname */ "kqswlnd",
/* .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_is_contiguous */ cfs_num_is_contiguous,
/* .nf_min_max */ cfs_num_min_max},
{/* .nf_type */ GMLND,
/* .nf_name */ "gm",
/* .nf_modname */ "kgmlnd",
/* .nf_addr2str */ libcfs_hexnum_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_is_contiguous */ cfs_num_is_contiguous,
/* .nf_min_max */ cfs_num_min_max},
{/* .nf_type */ MXLND,
/* .nf_name */ "mx",
/* .nf_modname */ "kmxlnd",
/* .nf_addr2str */ libcfs_ip_addr2str,
/* .nf_str2addr */ libcfs_ip_str2addr,
/* .nf_parse_addrlist*/ cfs_ip_addr_parse,
/* .nf_print_addrlist*/ libcfs_ip_addr_range_print,
/* .nf_match_addr*/ cfs_ip_addr_match,
/* .nf_is_contiguous */ cfs_ip_is_contiguous,
/* .nf_min_max */ cfs_ip_min_max},
{/* .nf_type */ PTLLND,
/* .nf_name */ "ptl",
/* .nf_modname */ "kptllnd",
/* .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_is_contiguous */ cfs_num_is_contiguous,
/* .nf_min_max */ cfs_num_min_max},
{/* .nf_type */ GNILND,
/* .nf_name */ "gni",
/* .nf_modname */ "kgnilnd",
/* .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_is_contiguous */ cfs_num_is_contiguous,
/* .nf_min_max */ cfs_num_min_max},
}; };
static const size_t libcfs_nnetstrfns = ARRAY_SIZE(libcfs_netstrfns); static const size_t libcfs_nnetstrfns = ARRAY_SIZE(libcfs_netstrfns);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7