diff options
| author | Srinivas Eeda <srinivas.eeda@oracle.com> | 2010-02-26 15:53:51 -0500 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-02-26 18:41:19 -0500 |
| commit | bc9838c4d44a1713ab1bf24aa6675bc3a02b6a88 (patch) | |
| tree | b78da3a8acacaf697f0b80edcef247b9700a1d6e | |
| parent | cbaee472f274ea9a98aabe47025f6e5551acadcb (diff) | |
dlm: allow dlm do recovery during shutdown
If a node down event happens while dlm shutdown in progress, dlm recovery
should be done before dlm is shutdown. We can't migrate unrecovered locks,
obviously. But dlm_reco_thread only does recovery if the dlm_state is
in DLM_CTXT_JOINED.
dlm_reco_thread should do recovery if dlm_state is in DLM_CTXT_JOINED or
DLM_CTXT_IN_SHUTDOWN.
Signed-off-by: Srinivas Eeda <srinivas.eeda@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
| -rw-r--r-- | fs/ocfs2/dlm/dlmrecovery.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c index 344bcf90cbf4..b4f99de2caf3 100644 --- a/fs/ocfs2/dlm/dlmrecovery.c +++ b/fs/ocfs2/dlm/dlmrecovery.c | |||
| @@ -310,7 +310,7 @@ static int dlm_recovery_thread(void *data) | |||
| 310 | mlog(0, "dlm thread running for %s...\n", dlm->name); | 310 | mlog(0, "dlm thread running for %s...\n", dlm->name); |
| 311 | 311 | ||
| 312 | while (!kthread_should_stop()) { | 312 | while (!kthread_should_stop()) { |
| 313 | if (dlm_joined(dlm)) { | 313 | if (dlm_domain_fully_joined(dlm)) { |
| 314 | status = dlm_do_recovery(dlm); | 314 | status = dlm_do_recovery(dlm); |
| 315 | if (status == -EAGAIN) { | 315 | if (status == -EAGAIN) { |
| 316 | /* do not sleep, recheck immediately. */ | 316 | /* do not sleep, recheck immediately. */ |
