X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Fconfig.c;h=5e367f00e577d68efd9d888f57c14ff3396730db;hb=df3904c3486c71da586d43fbfca8f126b5764838;hp=b63148c6b69d3f7e769f158f87f6819970136183;hpb=93b08edfb1c6ae8aec7e1009d3aca450416358d7;p=fs%2Flustre-release.git

diff --git a/lnet/lnet/config.c b/lnet/lnet/config.c
index b63148c..5e367f0 100644
--- a/lnet/lnet/config.c
+++ b/lnet/lnet/config.c
@@ -381,7 +381,6 @@ lnet_net_alloc(__u32 net_id, struct list_head *net_list)
 
 	net->net_id = net_id;
 	net->net_last_alive = ktime_get_real_seconds();
-	net->net_state = LNET_NET_STATE_INIT;
 
 	/* initialize global paramters to undefiend */
 	net->net_tunables.lct_peer_timeout = -1;
@@ -1313,7 +1312,7 @@ lnet_parse_routes (char *routes, int *im_a_router)
 static int
 lnet_match_network_token(char *token, int len, __u32 *ipaddrs, int nip)
 {
-	struct list_head list = LIST_HEAD_INIT(list);
+	LIST_HEAD(list);
 	int		rc;
 	int		i;
 
@@ -1604,6 +1603,19 @@ lnet_match_networks (char **networksp, char *ip2nets, __u32 *ipaddrs, int nip)
 	*networksp = networks;
 	return count;
 }
+/*
+ * kernel 5.3: commit ef11db3310e272d3d8dbe8739e0770820dd20e52
+ * added in_dev_for_each_ifa_rtnl and in_dev_for_each_ifa_rcu
+ * and removed for_ifa and endfor_ifa.
+ * Use the _rntl variant as the current locking is rtnl.
+ */
+#ifdef in_dev_for_each_ifa_rtnl
+#define DECLARE_CONST_IN_IFADDR(ifa)		const struct in_ifaddr *ifa
+#define endfor_ifa(in_dev)
+#else
+#define DECLARE_CONST_IN_IFADDR(ifa)
+#define in_dev_for_each_ifa_rtnl(ifa, in_dev)	for_ifa((in_dev))
+#endif
 
 int lnet_inet_enumerate(struct lnet_inetdev **dev_list, struct net *ns)
 {
@@ -1611,6 +1623,7 @@ int lnet_inet_enumerate(struct lnet_inetdev **dev_list, struct net *ns)
 	struct net_device *dev;
 	int nalloc = 0;
 	int nip = 0;
+	DECLARE_CONST_IN_IFADDR(ifa);
 
 	rtnl_lock();
 	for_each_netdev(ns, dev) {
@@ -1638,7 +1651,7 @@ int lnet_inet_enumerate(struct lnet_inetdev **dev_list, struct net *ns)
 		node_id = dev_to_node(&dev->dev);
 		cpt = cfs_cpt_of_node(lnet_cpt_table(), node_id);
 
-		for_ifa(in_dev) {
+		in_dev_for_each_ifa_rtnl(ifa, in_dev) {
 			if (nip >= nalloc) {
 				struct lnet_inetdev *tmp;