diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-10 14:13:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-10 14:13:55 -0400 |
| commit | 13dd7f876dffb44088c5435c3df1986e33cff960 (patch) | |
| tree | c9043429452663661dc888e1cbafa87bd2a62f44 /fs/gfs2 | |
| parent | b0af205afb111e17ac8db64c3b9c4f2c332de92a (diff) | |
| parent | 27eccf46491e1f77f9af9bbe0778122ce6882890 (diff) | |
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/gfs2/locking/dlm/mount.c b/fs/gfs2/locking/dlm/mount.c index 09d78c216f48..0c4cbe6c8285 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, | |||
| 144 | 144 | ||
| 145 | error = dlm_new_lockspace(ls->fsname, strlen(ls->fsname), | 145 | error = dlm_new_lockspace(ls->fsname, strlen(ls->fsname), |
| 146 | &ls->dlm_lockspace, | 146 | &ls->dlm_lockspace, |
| 147 | DLM_LSFL_FS | (nodir ? DLM_LSFL_NODIR : 0), | 147 | DLM_LSFL_FS | DLM_LSFL_NEWEXCL | |
| 148 | (nodir ? DLM_LSFL_NODIR : 0), | ||
| 148 | GDLM_LVB_SIZE); | 149 | GDLM_LVB_SIZE); |
| 149 | if (error) { | 150 | if (error) { |
| 150 | log_error("dlm_new_lockspace error %d", error); | 151 | log_error("dlm_new_lockspace error %d", error); |