diff options
| author | Kurt Hackel <kurt.hackel@oracle.com> | 2006-05-01 22:47:50 +0200 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-06-26 23:43:08 +0200 |
| commit | c8df412e1c746dd21094966d04b3a79aad0f4d08 (patch) | |
| tree | b662c0c5b9ff4e5a607d53adb92a8c38acce940e /fs/ocfs2/dlm/dlmrecovery.c | |
| parent | ocfs2: pending mastery asserts and migrations should block each other (diff) | |
| download | linux-c8df412e1c746dd21094966d04b3a79aad0f4d08.tar.xz linux-c8df412e1c746dd21094966d04b3a79aad0f4d08.zip | |
ocfs2: special case recovery lock in dlmlock_remote()
If the previous master of the recovery lock dies, let calc_usage take it
down completely and let the caller completely redo the dlmlock() call.
Otherwise, there will never be an opportunity to re-master the lockres and
recovery wont be able to progress.
Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/ocfs2/dlm/dlmrecovery.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c index 86199f66eb56..00209f4a2916 100644 --- a/fs/ocfs2/dlm/dlmrecovery.c +++ b/fs/ocfs2/dlm/dlmrecovery.c @@ -2314,6 +2314,10 @@ again: mlog(0, "%s: reco master %u is ready to recover %u\n", dlm->name, dlm->reco.new_master, dlm->reco.dead_node); status = -EEXIST; + } else if (ret == DLM_RECOVERING) { + mlog(0, "dlm=%s dlmlock says master node died (this=%u)\n", + dlm->name, dlm->node_num); + goto again; } else { struct dlm_lock_resource *res; |