From: Simon Horman <horms@verge.net.au>
To: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org,
netfilter@vger.kernel.org, lvs-devel@vger.kernel.org
Cc: Eric Dumazet <eric.dumazet@gmail.com>,
Julian Anastasov <ja@ssi.bg>,
Hans Schillstrom <hans@schillstrom.com>,
Simon Horman <horms@verge.net.au>
Subject: [PATCH 11/20] IPVS: Add sysctl_sync_ver()
Date: Mon, 14 Mar 2011 12:45:37 +0900 [thread overview]
Message-ID: <1300074346-13799-12-git-send-email-horms@verge.net.au> (raw)
In-Reply-To: <1300074346-13799-1-git-send-email-horms@verge.net.au>
In preparation for not including sysctl_sync_ver in
struct netns_ipvs when CONFIG_SYCTL is not defined.
Signed-off-by: Simon Horman <horms@verge.net.au>
---
include/net/ip_vs.h | 11 +++++++++++
net/netfilter/ipvs/ip_vs_sync.c | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 253736d..687ef18 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -911,6 +911,7 @@ struct netns_ipvs {
#define DEFAULT_SYNC_THRESHOLD 3
#define DEFAULT_SYNC_PERIOD 50
+#define DEFAULT_SYNC_VER 1
#ifdef CONFIG_SYSCTL
@@ -924,6 +925,11 @@ static inline int sysctl_sync_period(struct netns_ipvs *ipvs)
return ipvs->sysctl_sync_threshold[1];
}
+static inline int sysctl_sync_ver(struct netns_ipvs *ipvs)
+{
+ return ipvs->sysctl_sync_ver;
+}
+
#else
static inline int sysctl_sync_threshold(struct netns_ipvs *ipvs)
@@ -936,6 +942,11 @@ static inline int sysctl_sync_period(struct netns_ipvs *ipvs)
return DEFAULT_SYNC_PERIOD;
}
+static inline int sysctl_sync_ver(struct netns_ipvs *ipvs)
+{
+ return DEFAULT_SYNC_VER;
+}
+
#endif
/*
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index e84987f..3e7961e 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -394,7 +394,7 @@ void ip_vs_sync_switch_mode(struct net *net, int mode)
if (!(ipvs->sync_state & IP_VS_STATE_MASTER))
return;
- if (mode == ipvs->sysctl_sync_ver || !ipvs->sync_buff)
+ if (mode == sysctl_sync_ver(ipvs) || !ipvs->sync_buff)
return;
spin_lock_bh(&ipvs->sync_buff_lock);
@@ -521,7 +521,7 @@ void ip_vs_sync_conn(struct net *net, struct ip_vs_conn *cp)
unsigned int len, pe_name_len, pad;
/* Handle old version of the protocol */
- if (ipvs->sysctl_sync_ver == 0) {
+ if (sysctl_sync_ver(ipvs) == 0) {
ip_vs_sync_conn_v0(net, cp);
return;
}
--
1.7.2.3
next prev parent reply other threads:[~2011-03-14 3:45 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-14 3:45 [patch v3 00/20] IPVS: Proposed Changes Simon Horman
2011-03-14 3:45 ` [PATCH 01/20] ipvs: move struct netns_ipvs Simon Horman
2011-03-14 3:45 ` [PATCH 02/20] ipvs: reorganize tot_stats Simon Horman
2011-03-14 4:28 ` Eric Dumazet
2011-03-14 9:21 ` Julian Anastasov
2011-03-14 3:45 ` [PATCH 03/20] ipvs: properly zero stats and rates Simon Horman
2011-03-14 4:09 ` Eric Dumazet
2011-03-14 3:45 ` [PATCH 04/20] ipvs: remove unused seqcount stats Simon Horman
2011-03-14 3:45 ` [PATCH 05/20] ipvs: optimize rates reading Simon Horman
2011-03-14 3:45 ` [PATCH 06/20] ipvs: rename estimator functions Simon Horman
2011-03-14 3:45 ` [PATCH 07/20] IPVS: Add ip_vs_route_me_harder() Simon Horman
2011-03-14 3:45 ` [PATCH 08/20] IPVS: Add sysctl_snat_reroute() Simon Horman
2011-03-14 3:45 ` [PATCH 09/20] IPVS: Add sysctl_nat_icmp_send() Simon Horman
2011-03-14 3:45 ` [PATCH 10/20] IPVS: Add {sysctl_sync_threshold,period}() Simon Horman
2011-03-14 3:45 ` Simon Horman [this message]
2011-03-14 3:45 ` [PATCH 12/20] IPVS: Add sysctl_expire_nodest_conn() Simon Horman
2011-03-14 3:45 ` [PATCH 13/20] IPVS: Add expire_quiescent_template() Simon Horman
2011-03-14 3:45 ` [PATCH 14/20] IPVS: Conditinally use sysctl_lblc{r}_expiration Simon Horman
2011-03-14 3:45 ` [PATCH 15/20] IPVS: ip_vs_todrop() becomes a noop when CONFIG_SYSCTL is undefined Simon Horman
2011-03-14 3:45 ` [PATCH 16/20] IPVS: Conditional ip_vs_conntrack_enabled() Simon Horman
2011-03-14 3:45 ` [PATCH 17/20] IPVS: Minimise ip_vs_leave when CONFIG_SYSCTL is undefined Simon Horman
2011-03-14 3:45 ` [PATCH 18/20] IPVS: Conditionally define and use ip_vs_lblc{r}_table Simon Horman
2011-03-14 3:45 ` [PATCH 19/20] IPVS: Add __ip_vs_control_{init,cleanup}_sysctl() Simon Horman
2011-03-14 3:45 ` [PATCH 20/20] IPVS: Conditionally include sysctl members of struct netns_ipvs Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1300074346-13799-12-git-send-email-horms@verge.net.au \
--to=horms@verge.net.au \
--cc=eric.dumazet@gmail.com \
--cc=hans@schillstrom.com \
--cc=ja@ssi.bg \
--cc=lvs-devel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=netfilter@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).