Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[~andy/linux] / fs / dlm / memory.c

diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c
index 5352b03ff5aa81f9af31c081965f7ae8dd81f90e..f858fef6e41cf32167b3b5d6634458fc62e8d1e7 100644 (file)
--- a/fs/dlm/memory.c
+++ b/fs/dlm/memory.c
@@ -76,9 +76,7 @@ struct dlm_lkb *allocate_lkb(struct dlm_ls *ls)
 {
        struct dlm_lkb *lkb;
 
-       lkb = kmem_cache_alloc(lkb_cache, GFP_KERNEL);
-       if (lkb)
-               memset(lkb, 0, sizeof(*lkb));
+       lkb = kmem_cache_zalloc(lkb_cache, GFP_KERNEL);
        return lkb;
 }