X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=fs%2Focfs2%2Fdlm%2Fdlmrecovery.c;fp=fs%2Focfs2%2Fdlm%2Fdlmrecovery.c;h=505ab4281f36c0eda9f54353da7024d3b77d736b;hb=bb34f24c7d2c98d0c81838a7700e6068325b17a0;hp=ec8f75813beb48c3faf2f3182a117d00b0dc4b77;hpb=1202d4ba2899e083417b7b4fb9b544942fd2b9b7;p=sfrench%2Fcifs-2.6.git

diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index ec8f75813beb..505ab4281f36 100644
--- 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;