diff options
author | Simon Horman <horms@verge.net.au> | 2011-02-04 04:33:02 -0500 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2011-03-14 20:37:01 -0400 |
commit | fb1de432c1c7c26afb2e86d166fc37888b6a4423 (patch) | |
tree | 3921c02f51e84e0b770b3d946629b38fd1fd8b6a /net/netfilter/ipvs/ip_vs_lblc.c | |
parent | a7a86b8616bc1595c4f5f109b7c39d4eb5d55e32 (diff) |
IPVS: Conditionally define and use ip_vs_lblc{r}_table
ip_vs_lblc_table and ip_vs_lblcr_table, and code that uses them
are unnecessary when CONFIG_SYSCTL is undefined.
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_lblc.c')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_lblc.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c index 51a27f58030..f276df9896b 100644 --- a/net/netfilter/ipvs/ip_vs_lblc.c +++ b/net/netfilter/ipvs/ip_vs_lblc.c | |||
@@ -114,7 +114,7 @@ struct ip_vs_lblc_table { | |||
114 | /* | 114 | /* |
115 | * IPVS LBLC sysctl table | 115 | * IPVS LBLC sysctl table |
116 | */ | 116 | */ |
117 | 117 | #ifdef CONFIG_SYSCTL | |
118 | static ctl_table vs_vars_table[] = { | 118 | static ctl_table vs_vars_table[] = { |
119 | { | 119 | { |
120 | .procname = "lblc_expiration", | 120 | .procname = "lblc_expiration", |
@@ -125,6 +125,7 @@ static ctl_table vs_vars_table[] = { | |||
125 | }, | 125 | }, |
126 | { } | 126 | { } |
127 | }; | 127 | }; |
128 | #endif | ||
128 | 129 | ||
129 | static inline void ip_vs_lblc_free(struct ip_vs_lblc_entry *en) | 130 | static inline void ip_vs_lblc_free(struct ip_vs_lblc_entry *en) |
130 | { | 131 | { |
@@ -548,6 +549,7 @@ static struct ip_vs_scheduler ip_vs_lblc_scheduler = | |||
548 | /* | 549 | /* |
549 | * per netns init. | 550 | * per netns init. |
550 | */ | 551 | */ |
552 | #ifdef CONFIG_SYSCTL | ||
551 | static int __net_init __ip_vs_lblc_init(struct net *net) | 553 | static int __net_init __ip_vs_lblc_init(struct net *net) |
552 | { | 554 | { |
553 | struct netns_ipvs *ipvs = net_ipvs(net); | 555 | struct netns_ipvs *ipvs = net_ipvs(net); |
@@ -563,7 +565,6 @@ static int __net_init __ip_vs_lblc_init(struct net *net) | |||
563 | ipvs->sysctl_lblc_expiration = DEFAULT_EXPIRATION; | 565 | ipvs->sysctl_lblc_expiration = DEFAULT_EXPIRATION; |
564 | ipvs->lblc_ctl_table[0].data = &ipvs->sysctl_lblc_expiration; | 566 | ipvs->lblc_ctl_table[0].data = &ipvs->sysctl_lblc_expiration; |
565 | 567 | ||
566 | #ifdef CONFIG_SYSCTL | ||
567 | ipvs->lblc_ctl_header = | 568 | ipvs->lblc_ctl_header = |
568 | register_net_sysctl_table(net, net_vs_ctl_path, | 569 | register_net_sysctl_table(net, net_vs_ctl_path, |
569 | ipvs->lblc_ctl_table); | 570 | ipvs->lblc_ctl_table); |
@@ -572,7 +573,6 @@ static int __net_init __ip_vs_lblc_init(struct net *net) | |||
572 | kfree(ipvs->lblc_ctl_table); | 573 | kfree(ipvs->lblc_ctl_table); |
573 | return -ENOMEM; | 574 | return -ENOMEM; |
574 | } | 575 | } |
575 | #endif | ||
576 | 576 | ||
577 | return 0; | 577 | return 0; |
578 | } | 578 | } |
@@ -581,14 +581,19 @@ static void __net_exit __ip_vs_lblc_exit(struct net *net) | |||
581 | { | 581 | { |
582 | struct netns_ipvs *ipvs = net_ipvs(net); | 582 | struct netns_ipvs *ipvs = net_ipvs(net); |
583 | 583 | ||
584 | #ifdef CONFIG_SYSCTL | ||
585 | unregister_net_sysctl_table(ipvs->lblc_ctl_header); | 584 | unregister_net_sysctl_table(ipvs->lblc_ctl_header); |
586 | #endif | ||
587 | 585 | ||
588 | if (!net_eq(net, &init_net)) | 586 | if (!net_eq(net, &init_net)) |
589 | kfree(ipvs->lblc_ctl_table); | 587 | kfree(ipvs->lblc_ctl_table); |
590 | } | 588 | } |
591 | 589 | ||
590 | #else | ||
591 | |||
592 | static int __net_init __ip_vs_lblc_init(struct net *net) { return 0; } | ||
593 | static void __net_exit __ip_vs_lblc_exit(struct net *net) { } | ||
594 | |||
595 | #endif | ||
596 | |||
592 | static struct pernet_operations ip_vs_lblc_ops = { | 597 | static struct pernet_operations ip_vs_lblc_ops = { |
593 | .init = __ip_vs_lblc_init, | 598 | .init = __ip_vs_lblc_init, |
594 | .exit = __ip_vs_lblc_exit, | 599 | .exit = __ip_vs_lblc_exit, |