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

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

[PATCH] sysctl: register the ocfs2 sysctl numbers 



ocfs2 was did not have the binary number it uses under CTL_FS registered in
sysctl.h.  Register it to avoid future conflicts, and change the name of the
definition to be in line with the rest of the sysctl numbers.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Acked-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4ed075e9

fs/ocfs2/cluster/nodemanager.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static ctl_table ocfs2_nm_table[] = { 


static ctl_table ocfs2_mod_table[] = {

	{

		.ctl_name	= KERN_OCFS2_NM,

		.ctl_name	= FS_OCFS2_NM,

		.procname	= "nm",

		.data		= NULL,

		.maxlen		= 0,
@@ -67,7 +67,7 @@ static ctl_table ocfs2_mod_table[] = { 


static ctl_table ocfs2_kern_table[] = {

	{

		.ctl_name	= KERN_OCFS2,

		.ctl_name	= FS_OCFS2,

		.procname	= "ocfs2",

		.data		= NULL,

		.maxlen		= 0,

fs/ocfs2/cluster/nodemanager.h

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ 
#include <linux/configfs.h>

#include <linux/rbtree.h>



#define KERN_OCFS2		988

#define KERN_OCFS2_NM		1

#define FS_OCFS2_NM		1



const char *o2nm_get_hb_ctl_path(void);

include/linux/sysctl.h

+1 −0
Original line number Diff line number Diff line
@@ -814,6 +814,7 @@ enum 
	FS_AIO_NR=18,	/* current system-wide number of aio requests */

	FS_AIO_MAX_NR=19,	/* system-wide maximum number of aio requests */

	FS_INOTIFY=20,	/* inotify submenu */

	FS_OCFS2=988,	/* ocfs2 */

};



/* /proc/sys/fs/quota/ */