From 37922a49babbaed60fd55d851a818c49954a2285 Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Fri, 8 Sep 2006 11:40:10 -0700 Subject: [PATCH] --- yaml --- r: 35483 b: refs/heads/master c: f0681062b8e369d9fb6f3ce10f4e3fc8cea5f910 h: refs/heads/master i: 35481: 0f38552a28be6d9e08da9b53a19cd8a3098b9f4f 35479: 2eb953cb01bdebce9f407e9b3cbfa89483138b8f v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/dlmglue.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ab2222fe75a4..8fcd069059a7 100644 --- 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 index 151b41781eab..20c6ca8ac7fd 100644 --- 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);