Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07995674 authored by Zhang Yanfei's avatar Zhang Yanfei Committed by Simon Horman
Browse files

ipvs: change type of netns_ipvs->sysctl_sync_qlen_max 



This member of struct netns_ipvs is calculated from nr_free_buffer_pages
so change its type to unsigned long in case of overflow.  Also, type of
its related proc var sync_qlen_max and the return type of function
sysctl_sync_qlen_max() should be changed to unsigned long, too.

Besides, the type of ipvs_master_sync_state->sync_queue_len should be
changed to unsigned long accordingly.

Signed-off-by: default avatarZhang Yanfei <zhangyanfei@cn.fujitsu.com>
Cc: Julian Anastasov <ja@ssi.bg>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent a38e5e23

include/net/ip_vs.h

+4 −4
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ struct ip_vs_app { 
struct ipvs_master_sync_state {

	struct list_head	sync_queue;

	struct ip_vs_sync_buff	*sync_buff;

	int			sync_queue_len;

	unsigned long		sync_queue_len;

	unsigned int		sync_queue_delay;

	struct task_struct	*master_thread;

	struct delayed_work	master_wakeup_work;
@@ -998,7 +998,7 @@ struct netns_ipvs { 
	int			sysctl_snat_reroute;

	int			sysctl_sync_ver;

	int			sysctl_sync_ports;

	int			sysctl_sync_qlen_max;

	unsigned long		sysctl_sync_qlen_max;

	int			sysctl_sync_sock_size;

	int			sysctl_cache_bypass;

	int			sysctl_expire_nodest_conn;
@@ -1085,7 +1085,7 @@ static inline int sysctl_sync_ports(struct netns_ipvs *ipvs) 
	return ACCESS_ONCE(ipvs->sysctl_sync_ports);

}



static inline int sysctl_sync_qlen_max(struct netns_ipvs *ipvs)

static inline unsigned long sysctl_sync_qlen_max(struct netns_ipvs *ipvs)

{

	return ipvs->sysctl_sync_qlen_max;

}
@@ -1138,7 +1138,7 @@ static inline int sysctl_sync_ports(struct netns_ipvs *ipvs) 
	return 1;

}



static inline int sysctl_sync_qlen_max(struct netns_ipvs *ipvs)

static inline unsigned long sysctl_sync_qlen_max(struct netns_ipvs *ipvs)

{

	return IPVS_SYNC_QLEN_MAX;

}

net/netfilter/ipvs/ip_vs_ctl.c

+2 −2
Original line number Diff line number Diff line
@@ -1716,9 +1716,9 @@ static struct ctl_table vs_vars[] = { 
	},

	{

		.procname	= "sync_qlen_max",

		.maxlen		= sizeof(int),

		.maxlen		= sizeof(unsigned long),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

		.proc_handler	= proc_doulongvec_minmax,

	},

	{

		.procname	= "sync_sock_size",