Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[sfrench/cifs-2.6.git] / fs / dlm / memory.c

diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c
index f7783867491aedf9678f6c506d49bf636ddb68e0..54c14c6d06cb992e7e4cee5c3b4f73348fd257d3 100644 (file)
--- a/fs/dlm/memory.c
+++ b/fs/dlm/memory.c
@@ -18,7 +18,7 @@
 static struct kmem_cache *lkb_cache;
 
 
-int dlm_memory_init(void)
+int __init dlm_memory_init(void)
 {
        int ret = 0;
 
@@ -80,7 +80,7 @@ void dlm_free_lkb(struct dlm_lkb *lkb)
 {
        if (lkb->lkb_flags & DLM_IFL_USER) {
                struct dlm_user_args *ua;
-               ua = (struct dlm_user_args *)lkb->lkb_astparam;
+               ua = lkb->lkb_ua;
                if (ua) {
                        if (ua->lksb.sb_lvbptr)
                                kfree(ua->lksb.sb_lvbptr);