diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2015-09-21 13:01:44 -0500 |
|---|---|---|
| committer |   Simon Horman <horms@verge.net.au> | 2015-09-24 09:34:33 +0900 |
| commit | 3109d2f2d1fe068f1cc3b1f74f5022ab4aef52a7 (patch) | |
| tree | e3641b886509b166fbba1a68c28d77481bbd8210 /net/netfilter/ipvs/ip_vs_lblcr.c | |
| parent | ipvs: Pass ipvs not net to ip_vs_fill_conn (diff) | |
| download | linux-dev-3109d2f2d1fe068f1cc3b1f74f5022ab4aef52a7.tar.xz linux-dev-3109d2f2d1fe068f1cc3b1f74f5022ab4aef52a7.zip | |
ipvs: Store ipvs not net in struct ip_vs_service
In practice struct netns_ipvs is as meaningful as struct net and more
useful as it holds the ipvs specific data. So store a pointer to
struct netns_ipvs.
Update the accesses of param->net to access param->ipvs->net instead.
In functions where we are searching for an svc and filtering by net
filter by ipvs instead.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_lblcr.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_lblcr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c index 2229d2d8bbe0..796d70e47ddd 100644 --- a/net/netfilter/ipvs/ip_vs_lblcr.c +++ b/net/netfilter/ipvs/ip_vs_lblcr.c @@ -415,8 +415,7 @@ static void ip_vs_lblcr_flush(struct ip_vs_service *svc) static int sysctl_lblcr_expiration(struct ip_vs_service *svc) { #ifdef CONFIG_SYSCTL - struct netns_ipvs *ipvs = net_ipvs(svc->net); - return ipvs->sysctl_lblcr_expiration; + return svc->ipvs->sysctl_lblcr_expiration; #else return DEFAULT_EXPIRATION; #endif |