git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
fs
/
dlm
/
memory.c
diff --git
a/fs/dlm/memory.c
b/fs/dlm/memory.c
index
48dfc27
..
989b608
100644
(file)
--- a/
fs/dlm/memory.c
+++ b/
fs/dlm/memory.c
@@
-100,7
+100,8
@@
struct dlm_direntry *allocate_direntry(struct dlm_ls *ls, int namelen)
{
struct dlm_direntry *de;
- DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,);
+ DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,
+ printk("namelen = %d\n", namelen););
de = kmalloc(sizeof(*de) + namelen, GFP_KERNEL);
if (de)