From 191c96bcae286903765e82ff50c470067bd60717 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Wed, 13 Dec 2006 10:39:20 -0600
Subject: [PATCH] --- yaml --- r: 46273 b: refs/heads/master c:
 8d07fd509e9c82a59e37b8b18a2fd0e8ef8fc837 h: refs/heads/master i:   46271:
 1a9e5b77552bf4002e11f474f41aa09ea02e1efa v: v3

---
 [refs]              | 2 +-
 trunk/fs/dlm/lock.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a436022f1062..74ecc5f80fea 100644
--- 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
index cdf2cb9297fd..d8e919bad41a 100644
--- 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;
 }