LU-9680 utils: fix Netlink / YAML library handling

[fs/lustre-release.git] / libcfs / include / libcfs / linux / linux-net.h

diff --git a/libcfs/include/libcfs/linux/linux-net.h b/libcfs/include/libcfs/linux/linux-net.h
index cd6be13..17b1b30 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-net.h
+++ b/libcfs/include/libcfs/linux/linux-net.h
@@ -24,11 +24,16 @@
 #define __LIBCFS_LINUX_NET_H__
 
 #include <net/netlink.h>
+#include <net/genetlink.h>
 
 #ifndef HAVE_NLA_STRDUP
 char *nla_strdup(const struct nlattr *nla, gfp_t flags);
 #endif /* !HAVE_NLA_STRDUP */
 
+#ifdef HAVE_NLA_STRLCPY
+#define nla_strscpy    nla_strlcpy
+#endif /* HAVE_NLA_STRLCPY */
+
 #ifndef HAVE_NL_PARSE_WITH_EXT_ACK
 
 #define NL_SET_BAD_ATTR(extack, attr)
@@ -76,10 +81,33 @@ static inline int cfs_nla_parse_nested(struct nlattr *tb[], int maxtype,
 
 #endif
 
+#ifndef HAVE_GENL_DUMPIT_INFO
+struct cfs_genl_dumpit_info {
+       const struct genl_family *family;
+       const struct genl_ops *ops;
+       struct nlattr **attrs;
+};
+
+static inline const struct cfs_genl_dumpit_info *
+lnet_genl_dumpit_info(struct netlink_callback *cb)
+{
+       return (const struct cfs_genl_dumpit_info *)cb->args[1];
+}
+#else
+#define cfs_genl_dumpit_info   genl_dumpit_info
+
+static inline const struct cfs_genl_dumpit_info *
+lnet_genl_dumpit_info(struct netlink_callback *cb)
+{
+       return (const struct cfs_genl_dumpit_info *)genl_dumpit_info(cb);
+}
+#endif /* HAVE_GENL_DUMPIT_INFO */
+
 #ifdef HAVE_KERNEL_SETSOCKOPT
 
 #include <net/tcp.h>
 
+#if !defined(HAVE_TCP_SOCK_SET_QUICKACK)
 static inline void tcp_sock_set_quickack(struct sock *sk, int opt)
 {
        struct socket *sock = sk->sk_socket;
@@ -87,6 +115,7 @@ static inline void tcp_sock_set_quickack(struct sock *sk, int opt)
        kernel_setsockopt(sock, SOL_TCP, TCP_QUICKACK,
                          (char *)&opt, sizeof(opt));
 }
+#endif /* HAVE_TCP_SOCK_SET_QUICKACK */
 
 #if !defined(HAVE_TCP_SOCK_SET_NODELAY)
 static inline void tcp_sock_set_nodelay(struct sock *sk)
@@ -109,6 +138,7 @@ static inline int tcp_sock_set_keepidle(struct sock *sk, int opt)
 }
 #endif /* HAVE_TCP_SOCK_SET_KEEPIDLE */
 
+#if !defined(HAVE_TCP_SOCK_SET_KEEPINTVL)
 static inline int tcp_sock_set_keepintvl(struct sock *sk, int opt)
 {
        struct socket *sock = sk->sk_socket;
@@ -116,7 +146,9 @@ static inline int tcp_sock_set_keepintvl(struct sock *sk, int opt)
        return kernel_setsockopt(sock, SOL_TCP, TCP_KEEPINTVL,
                                 (char *)&opt, sizeof(opt));
 }
+#endif /* HAVE_TCP_SOCK_SET_KEEPINTVL */
 
+#if !defined(HAVE_TCP_SOCK_SET_KEEPCNT)
 static inline int tcp_sock_set_keepcnt(struct sock *sk, int opt)
 {
        struct socket *sock = sk->sk_socket;
@@ -124,6 +156,7 @@ static inline int tcp_sock_set_keepcnt(struct sock *sk, int opt)
        return kernel_setsockopt(sock, SOL_TCP, TCP_KEEPCNT,
                                 (char *)&opt, sizeof(opt));
 }
+#endif /* HAVE_TCP_SOCK_SET_KEEPCNT */
 #endif /* HAVE_KERNEL_SETSOCKOPT */
 
 #endif /* __LIBCFS_LINUX_NET_H__ */