---

yaml --- r: 46273 b: refs/heads/master c: 8d07fd5 h: refs/heads/master i: 46271: 1a9e5b7 v: v3
git-mirror · Feb 5, 2007 · 191c96b · 191c96b
1 parent fd91498
commit 191c96b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da49f36f4f64feb281d7663be99e779b2aecc607
+refs/heads/master: 8d07fd509e9c82a59e37b8b18a2fd0e8ef8fc837
diff --git a/trunk/fs/dlm/lock.c b/trunk/fs/dlm/lock.c
@@ -2430,8 +2430,12 @@ static int receive_request_args(struct dlm_ls *ls, struct dlm_lkb *lkb,
 
 	DLM_ASSERT(is_master_copy(lkb), dlm_print_lkb(lkb););
 
-	if (receive_lvb(ls, lkb, ms))
-		return -ENOMEM;
+	if (lkb->lkb_exflags & DLM_LKF_VALBLK) {
+		/* lkb was just created so there won't be an lvb yet */
+		lkb->lkb_lvbptr = allocate_lvb(ls);
+		if (!lkb->lkb_lvbptr)
+			return -ENOMEM;
+	}
 
 	return 0;
 }