Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb1de432 authored by Simon Horman's avatar Simon Horman
Browse files

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: default avatarSimon Horman <horms@verge.net.au>
parent a7a86b86

net/netfilter/ipvs/ip_vs_lblc.c

+10 −5
Original line number Original line Diff line number Diff line
@@ -114,7 +114,7 @@ struct ip_vs_lblc_table { 
/*

/*

 *      IPVS LBLC sysctl table

 *      IPVS LBLC sysctl table

 */

 */



#ifdef CONFIG_SYSCTL

static ctl_table vs_vars_table[] = {

static ctl_table vs_vars_table[] = {

	{

	{

		.procname	= "lblc_expiration",

		.procname	= "lblc_expiration",
@@ -125,6 +125,7 @@ static ctl_table vs_vars_table[] = { 
	},

	},

	{ }

	{ }

};

};

#endif





static inline void ip_vs_lblc_free(struct ip_vs_lblc_entry *en)

static inline void ip_vs_lblc_free(struct ip_vs_lblc_entry *en)

{

{
@@ -548,6 +549,7 @@ static struct ip_vs_scheduler ip_vs_lblc_scheduler = 
/*

/*

 *  per netns init.

 *  per netns init.

 */

 */

#ifdef CONFIG_SYSCTL

static int __net_init __ip_vs_lblc_init(struct net *net)

static int __net_init __ip_vs_lblc_init(struct net *net)

{

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	struct netns_ipvs *ipvs = net_ipvs(net);
@@ -563,7 +565,6 @@ static int __net_init __ip_vs_lblc_init(struct net *net) 
	ipvs->sysctl_lblc_expiration = DEFAULT_EXPIRATION;

	ipvs->sysctl_lblc_expiration = DEFAULT_EXPIRATION;

	ipvs->lblc_ctl_table[0].data = &ipvs->sysctl_lblc_expiration;

	ipvs->lblc_ctl_table[0].data = &ipvs->sysctl_lblc_expiration;





#ifdef CONFIG_SYSCTL

	ipvs->lblc_ctl_header =

	ipvs->lblc_ctl_header =

		register_net_sysctl_table(net, net_vs_ctl_path,

		register_net_sysctl_table(net, net_vs_ctl_path,

					  ipvs->lblc_ctl_table);

					  ipvs->lblc_ctl_table);
@@ -572,7 +573,6 @@ static int __net_init __ip_vs_lblc_init(struct net *net) 
			kfree(ipvs->lblc_ctl_table);

			kfree(ipvs->lblc_ctl_table);

		return -ENOMEM;

		return -ENOMEM;

	}

	}

#endif





	return 0;

	return 0;

}

}
@@ -581,14 +581,19 @@ static void __net_exit __ip_vs_lblc_exit(struct net *net) 
{

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	struct netns_ipvs *ipvs = net_ipvs(net);





#ifdef CONFIG_SYSCTL

	unregister_net_sysctl_table(ipvs->lblc_ctl_header);

	unregister_net_sysctl_table(ipvs->lblc_ctl_header);

#endif





	if (!net_eq(net, &init_net))

	if (!net_eq(net, &init_net))

		kfree(ipvs->lblc_ctl_table);

		kfree(ipvs->lblc_ctl_table);

}

}





#else



static int __net_init __ip_vs_lblc_init(struct net *net) { return 0; }

static void __net_exit __ip_vs_lblc_exit(struct net *net) { }



#endif



static struct pernet_operations ip_vs_lblc_ops = {

static struct pernet_operations ip_vs_lblc_ops = {

	.init = __ip_vs_lblc_init,

	.init = __ip_vs_lblc_init,

	.exit = __ip_vs_lblc_exit,

	.exit = __ip_vs_lblc_exit,

net/netfilter/ipvs/ip_vs_lblcr.c

+10 −4
Original line number Original line Diff line number Diff line
@@ -285,6 +285,7 @@ struct ip_vs_lblcr_table { 
};

};









#ifdef CONFIG_SYSCTL

/*

/*

 *      IPVS LBLCR sysctl table

 *      IPVS LBLCR sysctl table

 */

 */
@@ -299,6 +300,7 @@ static ctl_table vs_vars_table[] = { 
	},

	},

	{ }

	{ }

};

};

#endif





static inline void ip_vs_lblcr_free(struct ip_vs_lblcr_entry *en)

static inline void ip_vs_lblcr_free(struct ip_vs_lblcr_entry *en)

{

{
@@ -743,6 +745,7 @@ static struct ip_vs_scheduler ip_vs_lblcr_scheduler = 
/*

/*

 *  per netns init.

 *  per netns init.

 */

 */

#ifdef CONFIG_SYSCTL

static int __net_init __ip_vs_lblcr_init(struct net *net)

static int __net_init __ip_vs_lblcr_init(struct net *net)

{

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	struct netns_ipvs *ipvs = net_ipvs(net);
@@ -758,7 +761,6 @@ static int __net_init __ip_vs_lblcr_init(struct net *net) 
	ipvs->sysctl_lblcr_expiration = DEFAULT_EXPIRATION;

	ipvs->sysctl_lblcr_expiration = DEFAULT_EXPIRATION;

	ipvs->lblcr_ctl_table[0].data = &ipvs->sysctl_lblcr_expiration;

	ipvs->lblcr_ctl_table[0].data = &ipvs->sysctl_lblcr_expiration;





#ifdef CONFIG_SYSCTL

	ipvs->lblcr_ctl_header =

	ipvs->lblcr_ctl_header =

		register_net_sysctl_table(net, net_vs_ctl_path,

		register_net_sysctl_table(net, net_vs_ctl_path,

					  ipvs->lblcr_ctl_table);

					  ipvs->lblcr_ctl_table);
@@ -767,7 +769,6 @@ static int __net_init __ip_vs_lblcr_init(struct net *net) 
			kfree(ipvs->lblcr_ctl_table);

			kfree(ipvs->lblcr_ctl_table);

		return -ENOMEM;

		return -ENOMEM;

	}

	}

#endif





	return 0;

	return 0;

}

}
@@ -776,14 +777,19 @@ static void __net_exit __ip_vs_lblcr_exit(struct net *net) 
{

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	struct netns_ipvs *ipvs = net_ipvs(net);





#ifdef CONFIG_SYSCTL

	unregister_net_sysctl_table(ipvs->lblcr_ctl_header);

	unregister_net_sysctl_table(ipvs->lblcr_ctl_header);

#endif





	if (!net_eq(net, &init_net))

	if (!net_eq(net, &init_net))

		kfree(ipvs->lblcr_ctl_table);

		kfree(ipvs->lblcr_ctl_table);

}

}





#else



static int __net_init __ip_vs_lblcr_init(struct net *net) { return 0; }

static void __net_exit __ip_vs_lblcr_exit(struct net *net) { }



#endif



static struct pernet_operations ip_vs_lblcr_ops = {

static struct pernet_operations ip_vs_lblcr_ops = {

	.init = __ip_vs_lblcr_init,

	.init = __ip_vs_lblcr_init,

	.exit = __ip_vs_lblcr_exit,

	.exit = __ip_vs_lblcr_exit,