Pull hp-pci-root into test branch

[linux-2.6] / fs / dlm / memory.c

diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c
index 48dfc27861f426174c4e06f4da6fedcda4e0b345..5352b03ff5aa81f9af31c081965f7ae8dd81f90e 100644 (file)
--- a/fs/dlm/memory.c
+++ b/fs/dlm/memory.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #include "memory.h"
 
-static kmem_cache_t *lkb_cache;
+static struct kmem_cache *lkb_cache;
 
 
 int dlm_memory_init(void)
@@ -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)