[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: Eric W. Biederman <ebiederm@xmission.com> Acked-by: Mark Fasheh <mark.fasheh@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
4ed075e93b
commit
0e03036c97
3 changed files with 4 additions and 4 deletions
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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/ */
|
||||
|
|
Loading…
Reference in a new issue