Merge commit 'v2.6.27-rc8' into x86/setup

[linux-2.6-omap-h63xx.git] / fs / ocfs2 / dlm / dlmapi.h

diff --git a/fs/ocfs2/dlm/dlmapi.h b/fs/ocfs2/dlm/dlmapi.h
index 53652f51c0e1bd0b9d0bd67c9b7fe442fa9832f2..b5786a787fabe7d2a46930c278456f91d05343f8 100644 (file)
--- a/fs/ocfs2/dlm/dlmapi.h
+++ b/fs/ocfs2/dlm/dlmapi.h
@@ -182,6 +182,7 @@ enum dlm_status dlmlock(struct dlm_ctxt *dlm,
                        struct dlm_lockstatus *lksb,
                        int flags,
                        const char *name,
+                       int namelen,
                        dlm_astlockfunc_t *ast,
                        void *data,
                        dlm_bastlockfunc_t *bast);
@@ -192,7 +193,12 @@ enum dlm_status dlmunlock(struct dlm_ctxt *dlm,
                          dlm_astunlockfunc_t *unlockast,
                          void *data);
 
-struct dlm_ctxt * dlm_register_domain(const char *domain, u32 key);
+struct dlm_protocol_version {
+       u8 pv_major;
+       u8 pv_minor;
+};
+struct dlm_ctxt * dlm_register_domain(const char *domain, u32 key,
+                                     struct dlm_protocol_version *fs_proto);
 
 void dlm_unregister_domain(struct dlm_ctxt *dlm);