LU-9680 net: Netlink improvements

[fs/lustre-release.git] / lnet / lnet / api-ni.c

diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c
index f86a31f..f7be169 100644 (file)
--- a/lnet/lnet/api-ni.c
+++ b/lnet/lnet/api-ni.c
@@ -1918,8 +1918,8 @@ lnet_ping_target_setup(struct lnet_ping_buffer **ppbuf,
                       struct lnet_handle_md *ping_mdh,
                       int ni_count, bool set_eq)
 {
-       struct lnet_process_id id = {
-               .nid = LNET_NID_ANY,
+       struct lnet_processid id = {
+               .nid = LNET_ANY_NID,
                .pid = LNET_PID_ANY
        };
        struct lnet_me *me;
@@ -1937,7 +1937,7 @@ lnet_ping_target_setup(struct lnet_ping_buffer **ppbuf,
        }
 
        /* Ping target ME/MD */
-       me = LNetMEAttach(LNET_RESERVED_PORTAL, id,
+       me = LNetMEAttach(LNET_RESERVED_PORTAL, &id,
                          LNET_PROTO_PING_MATCHBITS, 0,
                          LNET_UNLINK, LNET_INS_AFTER);
        if (IS_ERR(me)) {
@@ -2135,12 +2135,12 @@ again:
 int lnet_push_target_post(struct lnet_ping_buffer *pbuf,
                          struct lnet_handle_md *mdhp)
 {
-       struct lnet_process_id id = { LNET_NID_ANY, LNET_PID_ANY };
+       struct lnet_processid id = { LNET_ANY_NID, LNET_PID_ANY };
        struct lnet_md md = { NULL };
        struct lnet_me *me;
        int rc;
 
-       me = LNetMEAttach(LNET_RESERVED_PORTAL, id,
+       me = LNetMEAttach(LNET_RESERVED_PORTAL, &id,
                          LNET_PROTO_PING_MATCHBITS, 0,
                          LNET_UNLINK, LNET_INS_AFTER);
        if (IS_ERR(me)) {
@@ -2753,9 +2753,9 @@ static int lnet_genl_parse_list(struct sk_buff *msg,
                                    list->lkl_maxattr);
 
                nla_put_u16(msg, LN_SCALAR_ATTR_INDEX, count);
-               if (props[count].lkp_values)
+               if (props[count].lkp_value)
                        nla_put_string(msg, LN_SCALAR_ATTR_VALUE,
-                                      props[count].lkp_values);
+                                      props[count].lkp_value);
                if (props[count].lkp_key_format)
                        nla_put_u16(msg, LN_SCALAR_ATTR_KEY_FORMAT,
                                    props[count].lkp_key_format);
@@ -2767,13 +2767,14 @@ static int lnet_genl_parse_list(struct sk_buff *msg,
                        rc = lnet_genl_parse_list(msg, data, ++idx);
                        if (rc < 0)
                                return rc;
+                       idx = rc;
                }
 
                nla_nest_end(msg, key);
        }
 
        nla_nest_end(msg, node);
-       return 0;
+       return idx;
 }
 
 int lnet_genl_send_scalar_list(struct sk_buff *msg, u32 portid, u32 seq,
@@ -2798,7 +2799,7 @@ int lnet_genl_send_scalar_list(struct sk_buff *msg, u32 portid, u32 seq,
 canceled:
        if (rc < 0)
                genlmsg_cancel(msg, hdr);
-       return rc;
+       return rc > 0 ? 0 : rc;
 }
 EXPORT_SYMBOL(lnet_genl_send_scalar_list);