diff options
-rw-r--r-- | fs/ocfs2/cluster/nodemanager.c | 4 | ||||
-rw-r--r-- | fs/ocfs2/cluster/nodemanager.h | 3 | ||||
-rw-r--r-- | include/linux/sysctl.h | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c index b17333a0606b..df763c7fd083 100644 --- a/fs/ocfs2/cluster/nodemanager.c +++ b/fs/ocfs2/cluster/nodemanager.c | |||
@@ -55,7 +55,7 @@ static ctl_table ocfs2_nm_table[] = { | |||
55 | 55 | ||
56 | static ctl_table ocfs2_mod_table[] = { | 56 | static ctl_table ocfs2_mod_table[] = { |
57 | { | 57 | { |
58 | .ctl_name = KERN_OCFS2_NM, | 58 | .ctl_name = FS_OCFS2_NM, |
59 | .procname = "nm", | 59 | .procname = "nm", |
60 | .data = NULL, | 60 | .data = NULL, |
61 | .maxlen = 0, | 61 | .maxlen = 0, |
@@ -67,7 +67,7 @@ static ctl_table ocfs2_mod_table[] = { | |||
67 | 67 | ||
68 | static ctl_table ocfs2_kern_table[] = { | 68 | static ctl_table ocfs2_kern_table[] = { |
69 | { | 69 | { |
70 | .ctl_name = KERN_OCFS2, | 70 | .ctl_name = FS_OCFS2, |
71 | .procname = "ocfs2", | 71 | .procname = "ocfs2", |
72 | .data = NULL, | 72 | .data = NULL, |
73 | .maxlen = 0, | 73 | .maxlen = 0, |
diff --git a/fs/ocfs2/cluster/nodemanager.h b/fs/ocfs2/cluster/nodemanager.h index 8fb23cacc2f5..070522138ae2 100644 --- a/fs/ocfs2/cluster/nodemanager.h +++ b/fs/ocfs2/cluster/nodemanager.h | |||
@@ -33,8 +33,7 @@ | |||
33 | #include <linux/configfs.h> | 33 | #include <linux/configfs.h> |
34 | #include <linux/rbtree.h> | 34 | #include <linux/rbtree.h> |
35 | 35 | ||
36 | #define KERN_OCFS2 988 | 36 | #define FS_OCFS2_NM 1 |
37 | #define KERN_OCFS2_NM 1 | ||
38 | 37 | ||
39 | const char *o2nm_get_hb_ctl_path(void); | 38 | const char *o2nm_get_hb_ctl_path(void); |
40 | 39 | ||
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 2eb372971607..5b8af9069797 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
@@ -814,6 +814,7 @@ enum | |||
814 | FS_AIO_NR=18, /* current system-wide number of aio requests */ | 814 | FS_AIO_NR=18, /* current system-wide number of aio requests */ |
815 | FS_AIO_MAX_NR=19, /* system-wide maximum number of aio requests */ | 815 | FS_AIO_MAX_NR=19, /* system-wide maximum number of aio requests */ |
816 | FS_INOTIFY=20, /* inotify submenu */ | 816 | FS_INOTIFY=20, /* inotify submenu */ |
817 | FS_OCFS2=988, /* ocfs2 */ | ||
817 | }; | 818 | }; |
818 | 819 | ||
819 | /* /proc/sys/fs/quota/ */ | 820 | /* /proc/sys/fs/quota/ */ |