diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 12:46:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 12:46:35 -0800 |
| commit | e5a9e8e6890d9b9c7a0f25b03ffdaf28614a9a4c (patch) | |
| tree | 5e8fbbcbb7516c8eca9c431b47c70c752823af39 /fs/ocfs2/dlm/userdlm.c | |
| parent | bfa271d026fef5d8db9a95342c38eab6f7b287a2 (diff) | |
| parent | d24fbcda0c4988322949df3d759f1cfb32b32953 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: Negotiate locking protocol versions.
Diffstat (limited to 'fs/ocfs2/dlm/userdlm.c')
| -rw-r--r-- | fs/ocfs2/dlm/userdlm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ocfs2/dlm/userdlm.c b/fs/ocfs2/dlm/userdlm.c index 7d2f578b267..4cb1d3dae25 100644 --- a/fs/ocfs2/dlm/userdlm.c +++ b/fs/ocfs2/dlm/userdlm.c @@ -645,7 +645,8 @@ bail: return status; } -struct dlm_ctxt *user_dlm_register_context(struct qstr *name) +struct dlm_ctxt *user_dlm_register_context(struct qstr *name, + struct dlm_protocol_version *proto) { struct dlm_ctxt *dlm; u32 dlm_key; @@ -661,7 +662,7 @@ struct dlm_ctxt *user_dlm_register_context(struct qstr *name) snprintf(domain, name->len + 1, "%.*s", name->len, name->name); - dlm = dlm_register_domain(domain, dlm_key); + dlm = dlm_register_domain(domain, dlm_key, proto); if (IS_ERR(dlm)) mlog_errno(PTR_ERR(dlm)); |