diff options
| author | Linus Torvalds | 2012-01-10 23:55:55 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2012-01-10 23:55:55 +0100 |
| commit | 49d41bae46f15da528ef9848fd7c9d38582aa8e9 (patch) | |
| tree | 76907a9a5066642a32cb238ef8d8367fc612d064 /fs/gfs2 | |
| parent | Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6 (diff) | |
| parent | dlm: add recovery callbacks (diff) | |
| download | kernel-qcow2-linux-49d41bae46f15da528ef9848fd7c9d38582aa8e9.tar.gz kernel-qcow2-linux-49d41bae46f15da528ef9848fd7c9d38582aa8e9.tar.xz kernel-qcow2-linux-49d41bae46f15da528ef9848fd7c9d38582aa8e9.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
dlm: add recovery callbacks
dlm: add node slots and generation
dlm: move recovery barrier calls
dlm: convert rsb list to rb_tree
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/lock_dlm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c index 98c80d8c2a62..ce85b62bc0a2 100644 --- 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); |