aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-10 11:13:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-10 11:13:55 -0700
commit13dd7f876dffb44088c5435c3df1986e33cff960 (patch)
treec9043429452663661dc888e1cbafa87bd2a62f44 /fs/gfs2
parentb0af205afb111e17ac8db64c3b9c4f2c332de92a (diff)
parent27eccf46491e1f77f9af9bbe0778122ce6882890 (diff)
downloadkernel_samsung_smdk4412-13dd7f876dffb44088c5435c3df1986e33cff960.tar.gz
kernel_samsung_smdk4412-13dd7f876dffb44088c5435c3df1986e33cff960.tar.bz2
kernel_samsung_smdk4412-13dd7f876dffb44088c5435c3df1986e33cff960.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm: dlm: choose better identifiers dlm: remove bkl dlm: fix address compare dlm: fix locking of lockspace list in dlm_scand dlm: detect available userspace daemon dlm: allow multiple lockspace creates
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/locking/dlm/mount.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/gfs2/locking/dlm/mount.c b/fs/gfs2/locking/dlm/mount.c
index 09d78c216f4..0c4cbe6c828 100644
--- a/fs/gfs2/locking/dlm/mount.c
+++ b/fs/gfs2/locking/dlm/mount.c
@@ -144,7 +144,8 @@ static int gdlm_mount(char *table_name, char *host_data,
error = dlm_new_lockspace(ls->fsname, strlen(ls->fsname),
&ls->dlm_lockspace,
- DLM_LSFL_FS | (nodir ? DLM_LSFL_NODIR : 0),
+ DLM_LSFL_FS | DLM_LSFL_NEWEXCL |
+ (nodir ? DLM_LSFL_NODIR : 0),
GDLM_LVB_SIZE);
if (error) {
log_error("dlm_new_lockspace error %d", error);