Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

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

diff --git a/fs/ocfs2/dlm/userdlm.h b/fs/ocfs2/dlm/userdlm.h
index 04178bc40b7633a3f1a2ad2265d1165c1a5cd677..c400e93bbf79af2a146bbdd2b4262e1417cf45bb 100644 (file)
--- a/fs/ocfs2/dlm/userdlm.h
+++ b/fs/ocfs2/dlm/userdlm.h
@@ -53,6 +53,7 @@ struct user_lock_res {
 
 #define USER_DLM_LOCK_ID_MAX_LEN  32
        char                     l_name[USER_DLM_LOCK_ID_MAX_LEN];
+       int                      l_namelen;
        int                      l_level;
        unsigned int             l_ro_holders;
        unsigned int             l_ex_holders;