summaryrefslogtreecommitdiff
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorMark Fasheh <mark.fasheh@oracle.com>2006-09-08 22:40:10 +0400
committerMark Fasheh <mark.fasheh@oracle.com>2006-09-25 00:50:42 +0400
commitf0681062b8e369d9fb6f3ce10f4e3fc8cea5f910 (patch)
tree5db79c33d86409a458775a0dff0a80485b37ee14 /fs/ocfs2
parentea5b3a187e2724fa9d08b2fbd3898c149ed95c6b (diff)
downloadlinux-f0681062b8e369d9fb6f3ce10f4e3fc8cea5f910.tar.xz
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>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/dlmglue.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index 151b41781eab..20c6ca8ac7fd 100644
--- 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);