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

Commit fd6065b4 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[PATCH] sysctl: C99 convert coda ctl_tables and remove binary sysctls 



Will converting the coda sysctl initializers I discovered that it is yet
another user of sysctl that was stomping CTL_KERN.  So off with it's
sys_sysctl support since it wasn't done in a supportable way.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Cc: Jan Harkes <jaharkes@cs.cmu.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2564b7bd

fs/coda/sysctl.c

+48 −10
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 


static struct ctl_table_header *fs_table_header;



#define FS_CODA         1       /* Coda file system */



#define CODA_TIMEOUT    3       /* timeout on upcalls to become intrble */

#define CODA_HARD       5       /* mount type "hard" or "soft" */

#define CODA_VFS 	 6       /* vfs statistics */
@@ -183,17 +181,57 @@ static const struct file_operations proc_cache_inv_stats_fops = { 
};



static ctl_table coda_table[] = {

 	{CODA_TIMEOUT, "timeout", &coda_timeout, sizeof(int), 0644, NULL, &proc_dointvec},

 	{CODA_HARD, "hard", &coda_hard, sizeof(int), 0644, NULL, &proc_dointvec},

 	{CODA_VFS, "vfs_stats", NULL, 0, 0644, NULL, &do_reset_coda_vfs_stats},

 	{CODA_CACHE_INV, "cache_inv_stats", NULL, 0, 0644, NULL, &do_reset_coda_cache_inv_stats},

 	{CODA_FAKE_STATFS, "fake_statfs", &coda_fake_statfs, sizeof(int), 0600, NULL, &proc_dointvec},

	{ 0 }

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "timeout",

		.data		= &coda_timeout,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "hard",

		.data		= &coda_hard,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "vfs_stats",

		.data		= NULL,

		.maxlen		= 0,

		.mode		= 0644,

		.proc_handler	= &do_reset_coda_vfs_stats

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "cache_inv_stats",

		.data		= NULL,

		.maxlen		= 0,

		.mode		= 0644,

		.proc_handler	= &do_reset_coda_cache_inv_stats

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "fake_statfs",

		.data		= &coda_fake_statfs,

		.maxlen		= sizeof(int),

		.mode		= 0600,

		.proc_handler	= &proc_dointvec

	},

	{}

};



static ctl_table fs_table[] = {

       {FS_CODA, "coda",    NULL, 0, 0555, coda_table},

       {0}

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "coda",

		.mode		= 0555,

		.child		= coda_table

	},

	{}

};