ocfs2/dlm: don't handle migrate lockres if already in shutdown

[sfrench/cifs-2.6.git] / fs / ocfs2 / dlm / dlmrecovery.c

diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index ec8f75813beb48c3faf2f3182a117d00b0dc4b77..505ab4281f36c0eda9f54353da7024d3b77d736b 100644 (file)
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -1378,6 +1378,15 @@ int dlm_mig_lockres_handler(struct o2net_msg *msg, u32 len, void *data,
        if (!dlm_grab(dlm))
                return -EINVAL;
 
+       if (!dlm_joined(dlm)) {
+               mlog(ML_ERROR, "Domain %s not joined! "
+                         "lockres %.*s, master %u\n",
+                         dlm->name, mres->lockname_len,
+                         mres->lockname, mres->master);
+               dlm_put(dlm);
+               return -EINVAL;
+       }
+
        BUG_ON(!(mres->flags & (DLM_MRES_RECOVERY|DLM_MRES_MIGRATION)));
 
        real_master = mres->master;