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

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

9p: Don't use binary sysctl numbers. 



The recent 9p commit: bd238fb4 that
supposedly only moved files also introduced a new 9p sysctl interface
that did not properly register it's sysctl binary numbers.

And since it was only for debugging clearly did not need a binary fast
path in any case.  So this patch just remove the binary numbers.

See Documentation/sysctl/ctl_unnumbered.txt for more details.

While I was at it I cleaned up the sysctl initializers a little as
well so there is less to read.

Cc: Latchesar Ionkov <lucho@ionkov.net>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f56d35e7

net/9p/sysctl.c

+8 −13
Original line number Diff line number Diff line
@@ -28,15 +28,10 @@ 
#include <linux/init.h>

#include <net/9p/9p.h>



enum {

	P9_SYSCTL_NET = 487,

	P9_SYSCTL_DEBUG = 1,

};



static ctl_table p9_table[] = {

static struct ctl_table p9_table[] = {

#ifdef CONFIG_NET_9P_DEBUG

	{

		.ctl_name       = P9_SYSCTL_DEBUG,

		.ctl_name       = CTL_UNNUMBERED,

		.procname       = "debug",

		.data           = &p9_debug_level,

		.maxlen         = sizeof(int),
@@ -44,21 +39,21 @@ static ctl_table p9_table[] = { 
		.proc_handler   = &proc_dointvec

	},

#endif

	{	.ctl_name	= 0 },

	{},

};



static ctl_table p9_net_table[] = {

static struct ctl_table p9_net_table[] = {

	{

		.ctl_name	= P9_SYSCTL_NET,

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "9p",

		.maxlen		= 0,

		.mode		= 0555,

		.child		= p9_table,

	},

	{	.ctl_name	= 0 },

	{},

};



static ctl_table p9_ctl_table[] = {

static struct ctl_table p9_ctl_table[] = {

	{

		.ctl_name	= CTL_NET,

		.procname	= "net",
@@ -66,7 +61,7 @@ static ctl_table p9_ctl_table[] = { 
		.mode		= 0555,

		.child		= p9_net_table,

	},

	{	.ctl_name	= 0 },

	{},

};



static struct ctl_table_header *p9_table_header;