Commit 90754f8e authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[IPVS]: Switch to using ctl_paths. 



The feature of ipvs ctls is that the net/ipv4/vs path
is common for core ipvs ctls and for two schedulers,
so I make it exported and re-use it in modules.

Two other .c files required linux/sysctl.h to make the
extern declaration of this path compile well.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b5ccd792

include/net/ip_vs.h

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#include <asm/types.h>		/* For __uXX types */

#include <linux/types.h>	/* For __beXX types in userland */



#include <linux/sysctl.h>	/* For ctl_path */



#define IP_VS_VERSION_CODE	0x010201

#define NVERSION(version)			\

	(version >> 16) & 0xFF,			\
@@ -854,6 +856,7 @@ extern int sysctl_ip_vs_expire_quiescent_template; 
extern int sysctl_ip_vs_sync_threshold[2];

extern int sysctl_ip_vs_nat_icmp_send;

extern struct ip_vs_stats ip_vs_stats;

extern struct ctl_path net_vs_ctl_path[];



extern struct ip_vs_service *

ip_vs_service_get(__u32 fwmark, __u16 protocol, __be32 vaddr, __be16 vport);

net/ipv4/ipvs/ip_vs_ctl.c

+7 −28
Original line number Diff line number Diff line
@@ -1591,34 +1591,13 @@ static struct ctl_table vs_vars[] = { 
	{ .ctl_name = 0 }

};



static ctl_table vs_table[] = {

	{

		.procname	= "vs",

		.mode		= 0555,

		.child		= vs_vars

	},

	{ .ctl_name = 0 }

};



static ctl_table ipvs_ipv4_table[] = {

	{

		.ctl_name	= NET_IPV4,

		.procname	= "ipv4",

		.mode		= 0555,

		.child		= vs_table,

	},

	{ .ctl_name = 0 }

};



static ctl_table vs_root_table[] = {

	{

		.ctl_name	= CTL_NET,

		.procname	= "net",

		.mode		= 0555,

		.child		= ipvs_ipv4_table,

	},

	{ .ctl_name = 0 }

struct ctl_path net_vs_ctl_path[] = {

	{ .procname = "net", .ctl_name = CTL_NET, },

	{ .procname = "ipv4", .ctl_name = NET_IPV4, },

	{ .procname = "vs", },

	{ }

};

EXPORT_SYMBOL_GPL(net_vs_ctl_path);



static struct ctl_table_header * sysctl_header;
@@ -2345,7 +2324,7 @@ int ip_vs_control_init(void) 
	proc_net_fops_create(&init_net, "ip_vs", 0, &ip_vs_info_fops);

	proc_net_fops_create(&init_net, "ip_vs_stats",0, &ip_vs_stats_fops);



	sysctl_header = register_sysctl_table(vs_root_table);

	sysctl_header = register_sysctl_paths(net_vs_ctl_path, vs_vars);



	/* Initialize ip_vs_svc_table, ip_vs_svc_fwm_table, ip_vs_rtable */

	for(idx = 0; idx < IP_VS_SVC_TAB_SIZE; idx++)  {

net/ipv4/ipvs/ip_vs_est.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/slab.h>

#include <linux/types.h>

#include <linux/interrupt.h>

#include <linux/sysctl.h>



#include <net/ip_vs.h>

net/ipv4/ipvs/ip_vs_lblc.c

+1 −30
Original line number Diff line number Diff line
@@ -123,35 +123,6 @@ static ctl_table vs_vars_table[] = { 
	{ .ctl_name = 0 }

};



static ctl_table vs_table[] = {

	{

		.procname	= "vs",

		.mode		= 0555,

		.child		= vs_vars_table

	},

	{ .ctl_name = 0 }

};



static ctl_table ipvs_ipv4_table[] = {

	{

		.ctl_name	= NET_IPV4,

		.procname	= "ipv4",

		.mode		= 0555,

		.child		= vs_table

	},

	{ .ctl_name = 0 }

};



static ctl_table lblc_root_table[] = {

	{

		.ctl_name	= CTL_NET,

		.procname	= "net",

		.mode		= 0555,

		.child		= ipvs_ipv4_table

	},

	{ .ctl_name = 0 }

};



static struct ctl_table_header * sysctl_header;



/*
@@ -582,7 +553,7 @@ static int __init ip_vs_lblc_init(void) 
	int ret;



	INIT_LIST_HEAD(&ip_vs_lblc_scheduler.n_list);

	sysctl_header = register_sysctl_table(lblc_root_table);

	sysctl_header = register_sysctl_paths(net_vs_ctl_path, vs_vars_table);

	ret = register_ip_vs_scheduler(&ip_vs_lblc_scheduler);

	if (ret)

		unregister_sysctl_table(sysctl_header);

net/ipv4/ipvs/ip_vs_lblcr.c

+1 −30
Original line number Diff line number Diff line
@@ -311,35 +311,6 @@ static ctl_table vs_vars_table[] = { 
	{ .ctl_name = 0 }

};



static ctl_table vs_table[] = {

	{

		.procname	= "vs",

		.mode		= 0555,

		.child		= vs_vars_table

	},

	{ .ctl_name = 0 }

};



static ctl_table ipvs_ipv4_table[] = {

	{

		.ctl_name	= NET_IPV4,

		.procname	= "ipv4",

		.mode		= 0555,

		.child		= vs_table

	},

	{ .ctl_name = 0 }

};



static ctl_table lblcr_root_table[] = {

	{

		.ctl_name	= CTL_NET,

		.procname	= "net",

		.mode		= 0555,

		.child		= ipvs_ipv4_table

	},

	{ .ctl_name = 0 }

};



static struct ctl_table_header * sysctl_header;



/*
@@ -771,7 +742,7 @@ static int __init ip_vs_lblcr_init(void) 
	int ret;



	INIT_LIST_HEAD(&ip_vs_lblcr_scheduler.n_list);

	sysctl_header = register_sysctl_table(lblcr_root_table);

	sysctl_header = register_sysctl_paths(net_vs_ctl_path, vs_vars_table);

	ret = register_ip_vs_scheduler(&ip_vs_lblcr_scheduler);

	if (ret)

		unregister_sysctl_table(sysctl_header);

CRA Git | Maintained and supported by SUSTech CRA and CCSE