From 8b8379d03d888a8c7e69f741ad5a1b9f0426dadd Mon Sep 17 00:00:00 2001
From: Kurt Hackel <kurt.hackel@oracle.com>
Date: Mon, 1 May 2006 11:53:33 -0700
Subject: [PATCH] --- yaml --- r: 30689 b: refs/heads/master c:
 f42a100b2272bc5cb44fb2aa03526b436b1d6833 h: refs/heads/master i:   30687:
 5b5eb0010e88d7c1fee1834052d4efba531a7b25 v: v3

---
 [refs]                         | 2 +-
 trunk/fs/ocfs2/dlm/dlmmaster.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 672fc1d415c5..b6b769cb7695 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ff06a93916b3f95e83c346f7530cf2f5c68ae0c
+refs/heads/master: f42a100b2272bc5cb44fb2aa03526b436b1d6833
diff --git a/trunk/fs/ocfs2/dlm/dlmmaster.c b/trunk/fs/ocfs2/dlm/dlmmaster.c
index 915283fb48c3..2e371e06894f 100644
--- a/trunk/fs/ocfs2/dlm/dlmmaster.c
+++ b/trunk/fs/ocfs2/dlm/dlmmaster.c
@@ -2050,6 +2050,7 @@ static int dlm_pre_master_reco_lockres(struct dlm_ctxt *dlm,
 				BUG();
 			/* host is down, so answer for that node would be
 			 * DLM_LOCK_RES_OWNER_UNKNOWN.  continue. */
+			ret = 0;
 		}
 
 		if (master != DLM_LOCK_RES_OWNER_UNKNOWN) {