---

yaml --- r: 35483 b: refs/heads/master c: f068106 h: refs/heads/master i: 35481: 0f38552 35479: 2eb953c v: v3
git-mirror · Sep 24, 2006 · 37922a4 · 37922a4
1 parent 89fb2df
commit 37922a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea5b3a187e2724fa9d08b2fbd3898c149ed95c6b
+refs/heads/master: f0681062b8e369d9fb6f3ce10f4e3fc8cea5f910
diff --git a/trunk/fs/ocfs2/dlmglue.c b/trunk/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 @@ static int ocfs2_cluster_lock(struct ocfs2_super *osb,
 				 &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);