LU-13235 lnet: copy the correct amount of CPTs to lnet_cpts

[fs/lustre-release.git] / lnet / lnet / config.c

diff --git a/lnet/lnet/config.c b/lnet/lnet/config.c
index e375cd6..7b7d775 100644 (file)
--- a/lnet/lnet/config.c
+++ b/lnet/lnet/config.c
@@ -203,9 +203,10 @@ lnet_net_append_cpts(__u32 *cpts, __u32 ncpts, struct lnet_net *net)
                        goto failed;
                }
 
-               memcpy(array, net->net_cpts, net->net_ncpts);
+               memcpy(array, net->net_cpts,
+                      net->net_ncpts * sizeof(*net->net_cpts));
                loc = array + net->net_ncpts;
-               memcpy(loc, added_cpts, j);
+               memcpy(loc, added_cpts, j * sizeof(*net->net_cpts));
 
                LIBCFS_FREE(net->net_cpts, sizeof(*net->net_cpts) *
                            net->net_ncpts);
@@ -904,13 +905,11 @@ lnet_free_text_bufs(struct list_head *tbs)
 static int
 lnet_str2tbs_sep(struct list_head *tbs, char *str)
 {
-       struct list_head  pending;
-       char             *sep;
-       int               nob;
-       int               i;
-       struct lnet_text_buf  *ltb;
-
-       INIT_LIST_HEAD(&pending);
+       LIST_HEAD(pending);
+       char *sep;
+       int nob;
+       int i;
+       struct lnet_text_buf *ltb;
 
        /* Split 'str' into separate commands */
        for (;;) {
@@ -988,7 +987,7 @@ static int
 lnet_str2tbs_expand(struct list_head *tbs, char *str)
 {
        char              num[16];
-       struct list_head  pending;
+       LIST_HEAD(pending);
        char             *sep;
        char             *sep2;
        char             *parsed;
@@ -1000,8 +999,6 @@ lnet_str2tbs_expand(struct list_head *tbs, char *str)
        int               nob;
        int               scanned;
 
-       INIT_LIST_HEAD(&pending);
-
        sep = strchr(str, '[');
        if (sep == NULL)                        /* nothing to expand */
                return 0;
@@ -1111,10 +1108,10 @@ static int
 lnet_parse_route (char *str, int *im_a_router)
 {
        /* static scratch buffer OK (single threaded) */
-       static char       cmd[LNET_SINGLE_TEXTBUF_NOB];
+       static char cmd[LNET_SINGLE_TEXTBUF_NOB];
 
-       struct list_head  nets;
-       struct list_head  gateways;
+       LIST_HEAD(nets);
+       LIST_HEAD(gateways);
        struct list_head *tmp1;
        struct list_head *tmp2;
        __u32             net;
@@ -1129,9 +1126,6 @@ lnet_parse_route (char *str, int *im_a_router)
        int               got_hops = 0;
        unsigned int      priority = 0;
 
-       INIT_LIST_HEAD(&gateways);
-       INIT_LIST_HEAD(&nets);
-
        /* save a copy of the string for error messages */
        strncpy(cmd, str, sizeof(cmd));
        cmd[sizeof(cmd) - 1] = '\0';
@@ -1276,13 +1270,11 @@ lnet_parse_route_tbs(struct list_head *tbs, int *im_a_router)
 int
 lnet_parse_routes (char *routes, int *im_a_router)
 {
-       struct list_head tbs;
-       int              rc = 0;
+       LIST_HEAD(tbs);
+       int rc = 0;
 
        *im_a_router = 0;
 
-       INIT_LIST_HEAD(&tbs);
-
        if (lnet_str2tbs_sep(&tbs, routes) < 0) {
                CERROR("Error parsing routes\n");
                rc = -EINVAL;
@@ -1475,9 +1467,9 @@ lnet_match_networks (char **networksp, char *ip2nets, __u32 *ipaddrs, int nip)
        static char       networks[LNET_SINGLE_TEXTBUF_NOB];
        static char       source[LNET_SINGLE_TEXTBUF_NOB];
 
-       struct list_head  raw_entries;
-       struct list_head  matched_nets;
-       struct list_head  current_nets;
+       LIST_HEAD(raw_entries);
+       LIST_HEAD(matched_nets);
+       LIST_HEAD(current_nets);
        struct list_head *t;
        struct list_head *t2;
        struct lnet_text_buf  *tb;
@@ -1489,15 +1481,12 @@ lnet_match_networks (char **networksp, char *ip2nets, __u32 *ipaddrs, int nip)
        int               dup;
        int               rc;
 
-       INIT_LIST_HEAD(&raw_entries);
        if (lnet_str2tbs_sep(&raw_entries, ip2nets) < 0) {
                CERROR("Error parsing ip2nets\n");
                LASSERT(lnet_tbnob == 0);
                return -EINVAL;
        }
 
-       INIT_LIST_HEAD(&matched_nets);
-       INIT_LIST_HEAD(&current_nets);
        networks[0] = 0;
        count = 0;
        len = 0;