git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
ocfs2
/
dlm
/
userdlm.c
diff --git
a/fs/ocfs2/dlm/userdlm.c
b/fs/ocfs2/dlm/userdlm.c
index
74ca4e5
..
e641b08
100644
(file)
--- a/
fs/ocfs2/dlm/userdlm.c
+++ b/
fs/ocfs2/dlm/userdlm.c
@@
-672,7
+672,7
@@
struct dlm_ctxt *user_dlm_register_context(struct qstr *name)
u32 dlm_key;
char *domain;
- domain = kmalloc(name->len + 1, GFP_
KERNEL
);
+ domain = kmalloc(name->len + 1, GFP_
NOFS
);
if (!domain) {
mlog_errno(-ENOMEM);
return ERR_PTR(-ENOMEM);