summaryrefslogtreecommitdiff
path: root/fs/xfs/linux-2.6/xfs_sysctl.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-20 14:39:18 +0400
committerIngo Molnar <mingo@elte.hu>2008-08-20 14:39:18 +0400
commit170465ee7f5a9a2d0ac71285507e52642e040353 (patch)
treedbca81f04cde9e625170abbd6a72555cfbeb194e /fs/xfs/linux-2.6/xfs_sysctl.c
parent169ad16bb87c10a3f7c108bb7008ebc0270f617a (diff)
parent1fca25427482387689fa27594c992a961d98768f (diff)
downloadlinux-170465ee7f5a9a2d0ac71285507e52642e040353.tar.xz
Merge branch 'linus' into x86/xen
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_sysctl.c')
-rw-r--r--fs/xfs/linux-2.6/xfs_sysctl.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/xfs/linux-2.6/xfs_sysctl.c b/fs/xfs/linux-2.6/xfs_sysctl.c
index bb997d75c05c..7dacb5bbde3f 100644
--- a/fs/xfs/linux-2.6/xfs_sysctl.c
+++ b/fs/xfs/linux-2.6/xfs_sysctl.c
@@ -259,15 +259,17 @@ static ctl_table xfs_root_table[] = {
{}
};
-void
+int
xfs_sysctl_register(void)
{
xfs_table_header = register_sysctl_table(xfs_root_table);
+ if (!xfs_table_header)
+ return -ENOMEM;
+ return 0;
}
void
xfs_sysctl_unregister(void)
{
- if (xfs_table_header)
- unregister_sysctl_table(xfs_table_header);
+ unregister_sysctl_table(xfs_table_header);
}