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

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

diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c
index 12c3bfd5e660fca4ebfac6e1b4146ccc1d9640f5..8fc24f4507a3fda8642700f13a614291cdfb5673 100644 (file)
--- a/fs/dlm/debug_fs.c
+++ b/fs/dlm/debug_fs.c
@@ -162,14 +162,12 @@ static int print_resource(struct dlm_rsb *res, struct seq_file *s)
 
 static void print_lock(struct seq_file *s, struct dlm_lkb *lkb, struct dlm_rsb *r)
 {
-       struct dlm_user_args *ua;
        unsigned int waiting = 0;
        uint64_t xid = 0;
 
        if (lkb->lkb_flags & DLM_IFL_USER) {
-               ua = (struct dlm_user_args *) lkb->lkb_astparam;
-               if (ua)
-                       xid = ua->xid;
+               if (lkb->lkb_ua)
+                       xid = lkb->lkb_ua->xid;
        }
 
        if (lkb->lkb_timestamp)
@@ -543,7 +541,7 @@ void dlm_delete_debug_file(struct dlm_ls *ls)
                debugfs_remove(ls->ls_debug_locks_dentry);
 }
 
-int dlm_register_debugfs(void)
+int __init dlm_register_debugfs(void)
 {
        mutex_init(&debug_buf_lock);
        dlm_root = debugfs_create_dir("dlm", NULL);