From 9b15742e8a3a851680ad06d1238cbbf703a2c9cb Mon Sep 17 00:00:00 2001 From: Kurt Hackel Date: Mon, 1 May 2006 14:30:39 -0700 Subject: [PATCH] --- yaml --- r: 30703 b: refs/heads/master c: 56a7c104bc91b4a5f970d7372ebb04eebc633c68 h: refs/heads/master i: 30701: 91767f9d93bbb848f5469813672be2210ad132f0 30699: 6b47896f7c1c132f7431f2b807eb935174516dd0 30695: 2ae7582ed5f82b0225130ec33c2a84c6aa5177f3 30687: 5b5eb0010e88d7c1fee1834052d4efba531a7b25 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d39f076c271d..144d3f506658 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44a7f1d063bbe45773353903f36d9d88fb73d82a +refs/heads/master: 56a7c104bc91b4a5f970d7372ebb04eebc633c68 diff --git a/trunk/fs/ocfs2/dlm/dlmrecovery.c b/trunk/fs/ocfs2/dlm/dlmrecovery.c index f76b498a1745..08336aec13d8 100644 --- a/trunk/fs/ocfs2/dlm/dlmrecovery.c +++ b/trunk/fs/ocfs2/dlm/dlmrecovery.c @@ -409,6 +409,13 @@ static int dlm_in_recovery(struct dlm_ctxt *dlm) void dlm_wait_for_recovery(struct dlm_ctxt *dlm) { + if (dlm_in_recovery(dlm)) { + mlog(ML_NOTICE, "%s: reco thread %d in recovery: " + "state=%d, master=%u, dead=%u\n", + dlm->name, dlm->dlm_reco_thread_task->pid, + dlm->reco.state, dlm->reco.new_master, + dlm->reco.dead_node); + } wait_event(dlm->reco.event, !dlm_in_recovery(dlm)); }