aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-02-14 03:33:57 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 11:09:58 -0500
commit0e03036c97b70b2602f7dedaa3a223ed7563c2c9 (patch)
tree203a9bef847aa73b21afd3898d10cabb1e18dba6 /fs/ocfs2
parent4ed075e93bad97d0fdbb8a1be62f2449988496cb (diff)
[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>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/cluster/nodemanager.c4
-rw-r--r--fs/ocfs2/cluster/nodemanager.h3
2 files changed, 3 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
56static ctl_table ocfs2_mod_table[] = { 56static 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
68static ctl_table ocfs2_kern_table[] = { 68static 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
39const char *o2nm_get_hb_ctl_path(void); 38const char *o2nm_get_hb_ctl_path(void);
40 39