ocfs2: Update dlmglue for new dlmlock() API

File system lock names are very regular right now, so we really only need to
pass an extra parameter to dlmlock().

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>

diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index 151b41781eabcd1e3b907c89ab8f4d0424cc9642..20c6ca8ac7fd15261f631bd793b1d1fddbd604fd 100644 (file)
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -810,6 +810,7 @@ static int ocfs2_lock_create(struct ocfs2_super *osb,
                         &lockres->l_lksb,
                         dlm_flags,
                         lockres->l_name,
+                        OCFS2_LOCK_ID_MAX_LEN - 1,
                         lockres->l_ops->ast,
                         lockres,
                         lockres->l_ops->bast);
@@ -999,6 +1000,7 @@ again:
                                 &lockres->l_lksb,
                                 lkm_flags|LKM_CONVERT|LKM_VALBLK,
                                 lockres->l_name,
+                                OCFS2_LOCK_ID_MAX_LEN - 1,
                                 lockres->l_ops->ast,
                                 lockres,
                                 lockres->l_ops->bast);
@@ -2419,6 +2421,7 @@ static int ocfs2_downconvert_lock(struct ocfs2_super *osb,
                         &lockres->l_lksb,
                         dlm_flags,
                         lockres->l_name,
+                        OCFS2_LOCK_ID_MAX_LEN - 1,
                         lockres->l_ops->ast,
                         lockres,
                         lockres->l_ops->bast);