ipvs: Pass ipvs not net to ip_vs_sync_conn (b61a8c1a) · Commits · 戴 / test

include/net/ip_vs.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1452,7 +1452,7 @@ static inline void ip_vs_dest_put_and_free(struct ip_vs_dest *dest)
		int start_sync_thread(struct netns_ipvs ipvs, struct ipvs_sync_daemon_cfg cfg,
		int state);
		int stop_sync_thread(struct netns_ipvs *ipvs, int state);
		void ip_vs_sync_conn(struct net net, struct ip_vs_conn cp, int pkts);
		void ip_vs_sync_conn(struct netns_ipvs ipvs, struct ip_vs_conn cp, int pkts);

		/* IPVS rate estimator prototypes (from ip_vs_est.c) */
		void ip_vs_start_estimator(struct net net, struct ip_vs_stats stats);

+1 −2

Original line number	Diff line number	Diff line
		@@ -801,7 +801,6 @@ static void ip_vs_conn_expire(unsigned long data)
		{
		struct ip_vs_conn cp = (struct ip_vs_conn )data;
		struct netns_ipvs *ipvs = cp->ipvs;
		struct net *net = ipvs->net;

		/*
		* do I control anybody?
		@@ -847,7 +846,7 @@ static void ip_vs_conn_expire(unsigned long data)
		cp->timeout = 60*HZ;

		if (ipvs->sync_state & IP_VS_STATE_MASTER)
		ip_vs_sync_conn(net, cp, sysctl_sync_threshold(ipvs));
		ip_vs_sync_conn(ipvs, cp, sysctl_sync_threshold(ipvs));

		ip_vs_conn_put(cp);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -1842,7 +1842,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
		pkts = atomic_add_return(1, &cp->in_pkts);

		if (ipvs->sync_state & IP_VS_STATE_MASTER)
		ip_vs_sync_conn(net, cp, pkts);
		ip_vs_sync_conn(ipvs, cp, pkts);

		ip_vs_conn_put(cp);
		return ret;

+2 −3

Original line number	Diff line number	Diff line
		@@ -614,7 +614,7 @@ static void ip_vs_sync_conn_v0(struct netns_ipvs ipvs, struct ip_vs_conn cp,
		pkts = atomic_add_return(1, &cp->in_pkts);
		else
		pkts = sysctl_sync_threshold(ipvs);
		ip_vs_sync_conn(ipvs->net, cp, pkts);
		ip_vs_sync_conn(ipvs, cp, pkts);
		}
		}

		@@ -623,9 +623,8 @@ static void ip_vs_sync_conn_v0(struct netns_ipvs ipvs, struct ip_vs_conn cp,
		* Called by ip_vs_in.
		* Sending Version 1 messages
		*/
		void ip_vs_sync_conn(struct net net, struct ip_vs_conn cp, int pkts)
		void ip_vs_sync_conn(struct netns_ipvs ipvs, struct ip_vs_conn cp, int pkts)
		{
		struct netns_ipvs *ipvs = net_ipvs(net);
		struct ip_vs_sync_mesg *m;
		union ip_vs_sync_conn *s;
		struct ip_vs_sync_buff *buff;