diff options
author | Mark Fasheh <mark.fasheh@oracle.com> | 2006-09-08 14:40:10 -0400 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-09-24 16:50:42 -0400 |
commit | f0681062b8e369d9fb6f3ce10f4e3fc8cea5f910 (patch) | |
tree | 5db79c33d86409a458775a0dff0a80485b37ee14 | |
parent | ea5b3a187e2724fa9d08b2fbd3898c149ed95c6b (diff) |
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>
-rw-r--r-- | fs/ocfs2/dlmglue.c | 3 |
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, | |||
810 | &lockres->l_lksb, | 810 | &lockres->l_lksb, |
811 | dlm_flags, | 811 | dlm_flags, |
812 | lockres->l_name, | 812 | lockres->l_name, |
813 | OCFS2_LOCK_ID_MAX_LEN - 1, | ||
813 | lockres->l_ops->ast, | 814 | lockres->l_ops->ast, |
814 | lockres, | 815 | lockres, |
815 | lockres->l_ops->bast); | 816 | lockres->l_ops->bast); |
@@ -999,6 +1000,7 @@ again: | |||
999 | &lockres->l_lksb, | 1000 | &lockres->l_lksb, |
1000 | lkm_flags|LKM_CONVERT|LKM_VALBLK, | 1001 | lkm_flags|LKM_CONVERT|LKM_VALBLK, |
1001 | lockres->l_name, | 1002 | lockres->l_name, |
1003 | OCFS2_LOCK_ID_MAX_LEN - 1, | ||
1002 | lockres->l_ops->ast, | 1004 | lockres->l_ops->ast, |
1003 | lockres, | 1005 | lockres, |
1004 | lockres->l_ops->bast); | 1006 | lockres->l_ops->bast); |
@@ -2419,6 +2421,7 @@ static int ocfs2_downconvert_lock(struct ocfs2_super *osb, | |||
2419 | &lockres->l_lksb, | 2421 | &lockres->l_lksb, |
2420 | dlm_flags, | 2422 | dlm_flags, |
2421 | lockres->l_name, | 2423 | lockres->l_name, |
2424 | OCFS2_LOCK_ID_MAX_LEN - 1, | ||
2422 | lockres->l_ops->ast, | 2425 | lockres->l_ops->ast, |
2423 | lockres, | 2426 | lockres, |
2424 | lockres->l_ops->bast); | 2427 | lockres->l_ops->bast); |