From: Kurt Hackel <kurt.hackel@oracle.com>
Date: Mon, 1 May 2006 18:53:33 +0000 (-0700)
Subject: ocfs2: have dlm_pre_master_reco_lockres() ignore dead nodes
X-Git-Tag: v2.6.18-rc1~594^2~21
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f42a100b2272bc5cb44fb2aa03526b436b1d6833;p=linux-2.6-omap-h63xx.git

ocfs2: have dlm_pre_master_reco_lockres() ignore dead nodes

Recovery will spin in dlm_pre_master_reco_lockres if we do not ignore
timed-out network responses from dead nodes.

Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
---

diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 915283fb48c..2e371e06894 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/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) {