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

Commit ab09203e authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

sysctl fs: Remove dead binary sysctl support 



Now that sys_sysctl is a generic wrapper around /proc/sys  .ctl_name
and .strategy members of sysctl tables are dead code.  Remove them.

Cc: Jan Harkes <jaharkes@cs.cmu.edu>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 2bc4657c

fs/coda/sysctl.c

+0 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ static struct ctl_table_header *fs_table_header; 


static ctl_table coda_table[] = {

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "timeout",

		.data		= &coda_timeout,

		.maxlen		= sizeof(int),
@@ -25,7 +24,6 @@ static ctl_table coda_table[] = { 
		.proc_handler	= &proc_dointvec

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "hard",

		.data		= &coda_hard,

		.maxlen		= sizeof(int),
@@ -33,7 +31,6 @@ static ctl_table coda_table[] = { 
		.proc_handler	= &proc_dointvec

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "fake_statfs",

		.data		= &coda_fake_statfs,

		.maxlen		= sizeof(int),
@@ -46,7 +43,6 @@ static ctl_table coda_table[] = { 
#ifdef CONFIG_SYSCTL

static ctl_table fs_table[] = {

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "coda",

		.mode		= 0555,

		.child		= coda_table

fs/eventpoll.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ ctl_table epoll_table[] = { 
		.proc_handler	= &proc_dointvec_minmax,

		.extra1		= &zero,

	},

	{ .ctl_name = 0 }

	{ }

};

#endif /* CONFIG_SYSCTL */

fs/lockd/svc.c

+3 −11
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ EXPORT_SYMBOL_GPL(lockd_down); 


static ctl_table nlm_sysctls[] = {

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "nlm_grace_period",

		.data		= &nlm_grace_period,

		.maxlen		= sizeof(unsigned long),
@@ -381,7 +380,6 @@ static ctl_table nlm_sysctls[] = { 
		.extra2		= (unsigned long *) &nlm_grace_period_max,

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "nlm_timeout",

		.data		= &nlm_timeout,

		.maxlen		= sizeof(unsigned long),
@@ -391,7 +389,6 @@ static ctl_table nlm_sysctls[] = { 
		.extra2		= (unsigned long *) &nlm_timeout_max,

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "nlm_udpport",

		.data		= &nlm_udpport,

		.maxlen		= sizeof(int),
@@ -401,7 +398,6 @@ static ctl_table nlm_sysctls[] = { 
		.extra2		= (int *) &nlm_port_max,

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "nlm_tcpport",

		.data		= &nlm_tcpport,

		.maxlen		= sizeof(int),
@@ -411,7 +407,6 @@ static ctl_table nlm_sysctls[] = { 
		.extra2		= (int *) &nlm_port_max,

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "nsm_use_hostnames",

		.data		= &nsm_use_hostnames,

		.maxlen		= sizeof(int),
@@ -419,34 +414,31 @@ static ctl_table nlm_sysctls[] = { 
		.proc_handler	= &proc_dointvec,

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "nsm_local_state",

		.data		= &nsm_local_state,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec,

	},

	{ .ctl_name = 0 }

	{ }

};



static ctl_table nlm_sysctl_dir[] = {

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "nfs",

		.mode		= 0555,

		.child		= nlm_sysctls,

	},

	{ .ctl_name = 0 }

	{ }

};



static ctl_table nlm_sysctl_root[] = {

	{

		.ctl_name	= CTL_FS,

		.procname	= "fs",

		.mode		= 0555,

		.child		= nlm_sysctl_dir,

	},

	{ .ctl_name = 0 }

	{ }

};



#endif	/* CONFIG_SYSCTL */

fs/nfs/sysctl.c

+3 −11
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ static struct ctl_table_header *nfs_callback_sysctl_table; 
static ctl_table nfs_cb_sysctls[] = {

#ifdef CONFIG_NFS_V4

	{

		.ctl_name = CTL_UNNUMBERED,

		.procname = "nfs_callback_tcpport",

		.data = &nfs_callback_set_tcpport,

		.maxlen = sizeof(int),
@@ -32,53 +31,46 @@ static ctl_table nfs_cb_sysctls[] = { 
		.extra2 = (int *)&nfs_set_port_max,

	},

	{

		.ctl_name = CTL_UNNUMBERED,

		.procname = "idmap_cache_timeout",

		.data = &nfs_idmap_cache_timeout,

		.maxlen = sizeof(int),

		.mode = 0644,

		.proc_handler = &proc_dointvec_jiffies,

		.strategy = &sysctl_jiffies,

	},

#endif

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "nfs_mountpoint_timeout",

		.data		= &nfs_mountpoint_expiry_timeout,

		.maxlen		= sizeof(nfs_mountpoint_expiry_timeout),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_jiffies,

		.strategy	= &sysctl_jiffies,

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "nfs_congestion_kb",

		.data		= &nfs_congestion_kb,

		.maxlen		= sizeof(nfs_congestion_kb),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec,

	},

	{ .ctl_name = 0 }

	{ }

};



static ctl_table nfs_cb_sysctl_dir[] = {

	{

		.ctl_name = CTL_UNNUMBERED,

		.procname = "nfs",

		.mode = 0555,

		.child = nfs_cb_sysctls,

	},

	{ .ctl_name = 0 }

	{ }

};



static ctl_table nfs_cb_sysctl_root[] = {

	{

		.ctl_name = CTL_FS,

		.procname = "fs",

		.mode = 0555,

		.child = nfs_cb_sysctl_dir,

	},

	{ .ctl_name = 0 }

	{ }

};



int nfs_register_sysctl(void)

fs/notify/inotify/inotify_user.c

+1 −7
Original line number Diff line number Diff line
@@ -69,36 +69,30 @@ static int zero; 


ctl_table inotify_table[] = {

	{

		.ctl_name	= INOTIFY_MAX_USER_INSTANCES,

		.procname	= "max_user_instances",

		.data		= &inotify_max_user_instances,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.extra1		= &zero,

	},

	{

		.ctl_name	= INOTIFY_MAX_USER_WATCHES,

		.procname	= "max_user_watches",

		.data		= &inotify_max_user_watches,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.extra1		= &zero,

	},

	{

		.ctl_name	= INOTIFY_MAX_QUEUED_EVENTS,

		.procname	= "max_queued_events",

		.data		= &inotify_max_queued_events,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.extra1		= &zero

	},

	{ .ctl_name = 0 }

	{ }

};

#endif /* CONFIG_SYSCTL */