diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 13:11:43 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 13:11:43 +0900 |
| commit | b1bdd255661369cb6eb90b6e181169b5e6d0f9b6 (patch) | |
| tree | 17d15f3a6dc5bdd6205070dbef0e339421b13d25 /fs/ocfs2/stack_user.c | |
| parent | 9d14070f656addddce3d63fd483de46930b51850 (diff) | |
| parent | c1537b4863da620f12f5b42ece61bf65314148ed (diff) | |
Merge branch 'sh/nommu' into sh-latest
Diffstat (limited to 'fs/ocfs2/stack_user.c')
| -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 a5ebe421195f..286edf1e231f 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; |