diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 14:55:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 14:55:55 -0800 |
| commit | 49d41bae46f15da528ef9848fd7c9d38582aa8e9 (patch) | |
| tree | 76907a9a5066642a32cb238ef8d8367fc612d064 /fs/ocfs2 | |
| parent | 7b3480f8b701170c046e1ed362946f5f0d005e13 (diff) | |
| parent | 60f98d1839376d30e13f3e452dce2433fad3060e (diff) | |
| download | op-kernel-dev-49d41bae46f15da528ef9848fd7c9d38582aa8e9.zip op-kernel-dev-49d41bae46f15da528ef9848fd7c9d38582aa8e9.tar.gz | |
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/ocfs2')
| -rw-r--r-- | fs/ocfs2/stack_user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c index a5ebe42..286edf1 100644 --- a/fs/ocfs2/stack_user.c +++ b/fs/ocfs2/stack_user.c @@ -827,8 +827,8 @@ static int user_cluster_connect(struct ocfs2_cluster_connection *conn) goto out; } - rc = dlm_new_lockspace(conn->cc_name, strlen(conn->cc_name), - &fsdlm, DLM_LSFL_FS, DLM_LVB_LEN); + rc = dlm_new_lockspace(conn->cc_name, NULL, DLM_LSFL_FS, DLM_LVB_LEN, + NULL, NULL, NULL, &fsdlm); if (rc) { ocfs2_live_connection_drop(control); goto out; |
