ocfs2: Negotiate locking protocol versions.

[linux-2.6-omap-h63xx.git] / fs / ocfs2 / dlm / userdlm.c

diff --git a/fs/ocfs2/dlm/userdlm.c b/fs/ocfs2/dlm/userdlm.c
index 7d2f578b267df7e8ae4f8cce2d46533f8f637e38..4cb1d3dae250d2237ce49e7c1d7f120dd8afafa7 100644 (file)
--- 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));