summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKurt Hackel <kurt.hackel@oracle.com>2006-05-01 20:53:33 +0200
committerMark Fasheh <mark.fasheh@oracle.com>2006-06-26 23:43:05 +0200
commitf42a100b2272bc5cb44fb2aa03526b436b1d6833 (patch)
tree37ca994cefc97bcfbf14491e1538fd2672df566a
parentocfs2: give the dlm dirty list a reference on the lockres (diff)
downloadlinux-f42a100b2272bc5cb44fb2aa03526b436b1d6833.tar.xz
linux-f42a100b2272bc5cb44fb2aa03526b436b1d6833.zip
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>
-rw-r--r--fs/ocfs2/dlm/dlmmaster.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 915283fb48c3..2e371e06894f 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) {