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

[cascardo/linux.git] / fs / gfs2 / lock_dlm.c

diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c
index 98c80d8..ce85b62 100644 (file)
--- a/fs/gfs2/lock_dlm.c
+++ b/fs/gfs2/lock_dlm.c
@@ -195,10 +195,10 @@ static int gdlm_mount(struct gfs2_sbd *sdp, const char *fsname)
                return -EINVAL;
        }
 
-       error = dlm_new_lockspace(fsname, strlen(fsname), &ls->ls_dlm,
+       error = dlm_new_lockspace(fsname, NULL, 
                                  DLM_LSFL_FS | DLM_LSFL_NEWEXCL |
                                  (ls->ls_nodir ? DLM_LSFL_NODIR : 0),
-                                 GDLM_LVB_SIZE);
+                                 GDLM_LVB_SIZE, NULL, NULL, NULL, &ls->ls_dlm);
        if (error)
                printk(KERN_ERR "dlm_new_lockspace error %d", error);