projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
knfsd: avoid Oops if buggy userspace performs confusing filehandle->dentry mapping
[powerpc.git]
/
fs
/
dlm
/
main.c
diff --git
a/fs/dlm/main.c
b/fs/dlm/main.c
index
81bf4cb
..
162fbae
100644
(file)
--- a/
fs/dlm/main.c
+++ b/
fs/dlm/main.c
@@
-14,8
+14,8
@@
#include "dlm_internal.h"
#include "lockspace.h"
#include "lock.h"
#include "dlm_internal.h"
#include "lockspace.h"
#include "lock.h"
+#include "user.h"
#include "memory.h"
#include "memory.h"
-#include "lowcomms.h"
#include "config.h"
#ifdef CONFIG_DLM_DEBUG
#include "config.h"
#ifdef CONFIG_DLM_DEBUG
@@
-46,7
+46,7
@@
static int __init init_dlm(void)
if (error)
goto out_config;
if (error)
goto out_config;
- error = dlm_
lowcomms
_init();
+ error = dlm_
user
_init();
if (error)
goto out_debug;
if (error)
goto out_debug;
@@
-68,7
+68,7
@@
static int __init init_dlm(void)
static void __exit exit_dlm(void)
{
static void __exit exit_dlm(void)
{
- dlm_
lowcomms
_exit();
+ dlm_
user
_exit();
dlm_config_exit();
dlm_memory_exit();
dlm_lockspace_exit();
dlm_config_exit();
dlm_memory_exit();
dlm_lockspace_exit();