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 17/24] IPVS: Add expire_quiescent_template()
Date: Mon, 14 Mar 2011 18:06:29 +0900 [thread overview]
Message-ID: <1300093596-3824-18-git-send-email-horms@verge.net.au> (raw)
In-Reply-To: <1300093596-3824-1-git-send-email-horms@verge.net.au>
In preparation for not including sysctl_expire_quiescent_template in
struct netns_ipvs when CONFIG_SYCTL is not defined.
Signed-off-by: Simon Horman <horms@verge.net.au>
---
net/netfilter/ipvs/ip_vs_conn.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index 9c2a517..f289306 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -680,6 +680,16 @@ static inline void ip_vs_unbind_dest(struct ip_vs_conn *cp)
atomic_dec(&dest->refcnt);
}
+static int expire_quiescent_template(struct netns_ipvs *ipvs,
+ struct ip_vs_dest *dest)
+{
+#ifdef CONFIG_SYSCTL
+ return ipvs->sysctl_expire_quiescent_template &&
+ (atomic_read(&dest->weight) == 0);
+#else
+ return 0;
+#endif
+}
/*
* Checking if the destination of a connection template is available.
@@ -696,8 +706,7 @@ int ip_vs_check_template(struct ip_vs_conn *ct)
*/
if ((dest == NULL) ||
!(dest->flags & IP_VS_DEST_F_AVAILABLE) ||
- (ipvs->sysctl_expire_quiescent_template &&
- (atomic_read(&dest->weight) == 0))) {
+ expire_quiescent_template(ipvs, dest)) {
IP_VS_DBG_BUF(9, "check_template: dest not available for "
"protocol %s s:%s:%d v:%s:%d "
"-> d:%s:%d\n",
--
1.7.2.3
next prev parent reply other threads:[~2011-03-14 9:06 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-14 9:06 [GIT PULL nf-next-2.6] IPVS Simon Horman
2011-03-14 9:06 ` [PATCH 01/24] ipvs: avoid lookup for fwmark 0 Simon Horman
2011-03-14 9:06 ` [PATCH 02/24] ipvs: remove _bh from percpu stats reading Simon Horman
2011-03-14 9:06 ` [PATCH 03/24] netfilter:ipvs: use kmemdup Simon Horman
2011-03-14 9:06 ` [PATCH 04/24] Fix variable assignment in ip_vs_notrack Simon Horman
2011-03-14 9:06 ` [PATCH 05/24] ipvs: move struct netns_ipvs Simon Horman
2011-03-14 9:06 ` [PATCH 06/24] ipvs: reorganize tot_stats Simon Horman
2011-03-14 9:06 ` [PATCH 07/24] ipvs: properly zero stats and rates Simon Horman
2011-03-14 9:06 ` [PATCH 08/24] ipvs: remove unused seqcount stats Simon Horman
2011-03-14 9:06 ` [PATCH 09/24] ipvs: optimize rates reading Simon Horman
2011-03-14 9:06 ` [PATCH 10/24] ipvs: rename estimator functions Simon Horman
2011-03-14 9:06 ` [PATCH 11/24] IPVS: Add ip_vs_route_me_harder() Simon Horman
2011-03-14 9:06 ` [PATCH 12/24] IPVS: Add sysctl_snat_reroute() Simon Horman
2011-03-14 9:06 ` [PATCH 13/24] IPVS: Add sysctl_nat_icmp_send() Simon Horman
2011-03-14 9:06 ` [PATCH 14/24] IPVS: Add {sysctl_sync_threshold,period}() Simon Horman
2011-03-14 9:06 ` [PATCH 15/24] IPVS: Add sysctl_sync_ver() Simon Horman
2011-03-14 9:06 ` [PATCH 16/24] IPVS: Add sysctl_expire_nodest_conn() Simon Horman
2011-03-14 9:06 ` Simon Horman [this message]
2011-03-14 9:06 ` [PATCH 18/24] IPVS: Conditinally use sysctl_lblc{r}_expiration Simon Horman
2011-03-14 9:06 ` [PATCH 19/24] IPVS: ip_vs_todrop() becomes a noop when CONFIG_SYSCTL is undefined Simon Horman
2011-03-14 9:06 ` [PATCH 20/24] IPVS: Conditional ip_vs_conntrack_enabled() Simon Horman
2011-03-14 9:06 ` [PATCH 21/24] IPVS: Minimise ip_vs_leave when CONFIG_SYSCTL is undefined Simon Horman
2011-03-14 9:06 ` [PATCH 22/24] IPVS: Conditionally define and use ip_vs_lblc{r}_table Simon Horman
2011-03-14 9:06 ` [PATCH 23/24] IPVS: Add __ip_vs_control_{init,cleanup}_sysctl() Simon Horman
2011-03-14 9:06 ` [PATCH 24/24] IPVS: Conditionally include sysctl members of struct netns_ipvs Simon Horman
-- strict thread matches above, loose matches on Subject: below --
2011-03-15 5:27 [GIT PULL nf-next-2.6] IPVS Simon Horman
2011-03-15 5:27 ` [PATCH 17/24] IPVS: Add expire_quiescent_template() 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=1300093596-3824-18-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).