diff options
author | Srinivas Eeda <srinivas.eeda@oracle.com> | 2010-02-26 12:53:51 -0800 |
---|---|---|
committer | Joel Becker <joel.becker@oracle.com> | 2010-02-26 15:41:19 -0800 |
commit | bc9838c4d44a1713ab1bf24aa6675bc3a02b6a88 (patch) | |
tree | b78da3a8acacaf697f0b80edcef247b9700a1d6e /fs/ocfs2/dlm | |
parent | cbaee472f274ea9a98aabe47025f6e5551acadcb (diff) | |
download | linux-stable-bc9838c4d44a1713ab1bf24aa6675bc3a02b6a88.tar.gz linux-stable-bc9838c4d44a1713ab1bf24aa6675bc3a02b6a88.tar.bz2 linux-stable-bc9838c4d44a1713ab1bf24aa6675bc3a02b6a88.zip |
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>
Diffstat (limited to 'fs/ocfs2/dlm')
-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) mlog(0, "dlm thread running for %s...\n", dlm->name); while (!kthread_should_stop()) { - if (dlm_joined(dlm)) { + if (dlm_domain_fully_joined(dlm)) { status = dlm_do_recovery(dlm); if (status == -EAGAIN) { /* do not sleep, recheck immediately. */ |