Commit f0681062 authored by Mark Fasheh's avatar Mark Fasheh

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: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent ea5b3a18
...@@ -810,6 +810,7 @@ static int ocfs2_lock_create(struct ocfs2_super *osb, ...@@ -810,6 +810,7 @@ static int ocfs2_lock_create(struct ocfs2_super *osb,
&lockres->l_lksb, &lockres->l_lksb,
dlm_flags, dlm_flags,
lockres->l_name, lockres->l_name,
OCFS2_LOCK_ID_MAX_LEN - 1,
lockres->l_ops->ast, lockres->l_ops->ast,
lockres, lockres,
lockres->l_ops->bast); lockres->l_ops->bast);
...@@ -999,6 +1000,7 @@ static int ocfs2_cluster_lock(struct ocfs2_super *osb, ...@@ -999,6 +1000,7 @@ static int ocfs2_cluster_lock(struct ocfs2_super *osb,
&lockres->l_lksb, &lockres->l_lksb,
lkm_flags|LKM_CONVERT|LKM_VALBLK, lkm_flags|LKM_CONVERT|LKM_VALBLK,
lockres->l_name, lockres->l_name,
OCFS2_LOCK_ID_MAX_LEN - 1,
lockres->l_ops->ast, lockres->l_ops->ast,
lockres, lockres,
lockres->l_ops->bast); lockres->l_ops->bast);
...@@ -2419,6 +2421,7 @@ static int ocfs2_downconvert_lock(struct ocfs2_super *osb, ...@@ -2419,6 +2421,7 @@ static int ocfs2_downconvert_lock(struct ocfs2_super *osb,
&lockres->l_lksb, &lockres->l_lksb,
dlm_flags, dlm_flags,
lockres->l_name, lockres->l_name,
OCFS2_LOCK_ID_MAX_LEN - 1,
lockres->l_ops->ast, lockres->l_ops->ast,
lockres, lockres,
lockres->l_ops->bast); lockres->l_ops->bast);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment