diff options
author | Zhang Yanfei <zhangyanfei@cn.fujitsu.com> | 2013-04-29 14:55:10 -0400 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2013-05-25 19:17:33 -0400 |
commit | 079956742452494326081349a66942654498cafa (patch) | |
tree | f5fa4e63d7a8b56e62a572fed5371fdf78ba2edc /include/net/ip_vs.h | |
parent | a38e5e230e3f4e7bc9195d3e7a81567c888257ca (diff) |
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: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Cc: Julian Anastasov <ja@ssi.bg>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'include/net/ip_vs.h')
-rw-r--r-- | include/net/ip_vs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 4c062ccff9aa..4405886980c7 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
@@ -905,7 +905,7 @@ struct ip_vs_app { | |||
905 | struct ipvs_master_sync_state { | 905 | struct ipvs_master_sync_state { |
906 | struct list_head sync_queue; | 906 | struct list_head sync_queue; |
907 | struct ip_vs_sync_buff *sync_buff; | 907 | struct ip_vs_sync_buff *sync_buff; |
908 | int sync_queue_len; | 908 | unsigned long sync_queue_len; |
909 | unsigned int sync_queue_delay; | 909 | unsigned int sync_queue_delay; |
910 | struct task_struct *master_thread; | 910 | struct task_struct *master_thread; |
911 | struct delayed_work master_wakeup_work; | 911 | struct delayed_work master_wakeup_work; |
@@ -998,7 +998,7 @@ struct netns_ipvs { | |||
998 | int sysctl_snat_reroute; | 998 | int sysctl_snat_reroute; |
999 | int sysctl_sync_ver; | 999 | int sysctl_sync_ver; |
1000 | int sysctl_sync_ports; | 1000 | int sysctl_sync_ports; |
1001 | int sysctl_sync_qlen_max; | 1001 | unsigned long sysctl_sync_qlen_max; |
1002 | int sysctl_sync_sock_size; | 1002 | int sysctl_sync_sock_size; |
1003 | int sysctl_cache_bypass; | 1003 | int sysctl_cache_bypass; |
1004 | int sysctl_expire_nodest_conn; | 1004 | int sysctl_expire_nodest_conn; |
@@ -1085,7 +1085,7 @@ static inline int sysctl_sync_ports(struct netns_ipvs *ipvs) | |||
1085 | return ACCESS_ONCE(ipvs->sysctl_sync_ports); | 1085 | return ACCESS_ONCE(ipvs->sysctl_sync_ports); |
1086 | } | 1086 | } |
1087 | 1087 | ||
1088 | static inline int sysctl_sync_qlen_max(struct netns_ipvs *ipvs) | 1088 | static inline unsigned long sysctl_sync_qlen_max(struct netns_ipvs *ipvs) |
1089 | { | 1089 | { |
1090 | return ipvs->sysctl_sync_qlen_max; | 1090 | return ipvs->sysctl_sync_qlen_max; |
1091 | } | 1091 | } |
@@ -1138,7 +1138,7 @@ static inline int sysctl_sync_ports(struct netns_ipvs *ipvs) | |||
1138 | return 1; | 1138 | return 1; |
1139 | } | 1139 | } |
1140 | 1140 | ||
1141 | static inline int sysctl_sync_qlen_max(struct netns_ipvs *ipvs) | 1141 | static inline unsigned long sysctl_sync_qlen_max(struct netns_ipvs *ipvs) |
1142 | { | 1142 | { |
1143 | return IPVS_SYNC_QLEN_MAX; | 1143 | return IPVS_SYNC_QLEN_MAX; |
1144 | } | 1144 | } |