ocfs2/dlm: Use negotiated o2dlm protocol version

Sunil Mushran · jlbec · commit 4da6dc293604 · 2011-05-13T11:26:37.000-07:00
Patch fixes a bug in the o2dlm protocol negotiation in that it is using
the builtin version rather than the negotiated version during the domain
join. This causes join errors when a node having kernel &gt;= 2.6.37 joins
a cluster with nodes having kernels &lt; 2.6.37.

This only affects the o2cb cluster stack.

Signed-off-by: Sunil Mushran &lt;sunil.mushran@oracle.com&gt;
Reported-by: Jacek Stepniewski &lt;Jacek.Stepniewski@agora.pl&gt;
Acked-by: Mark Fasheh &lt;mfasheh@suse.com&gt;
Signed-off-by: Joel Becker &lt;jlbec@evilplan.org&gt;
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
@@ -1614,7 +1614,8 @@ static int dlm_try_to_join_domain(struct dlm_ctxt *dlm)
 	spin_unlock(&dlm->spinlock);
 
 	/* Support for global heartbeat and node info was added in 1.1 */
-	if (dlm_protocol.pv_major > 1 || dlm_protocol.pv_minor > 0) {
+	if (dlm->dlm_locking_proto.pv_major > 1 ||
+	    dlm->dlm_locking_proto.pv_minor > 0) {
 		status = dlm_send_nodeinfo(dlm, ctxt->yes_resp_map);
 		if (status) {
 			mlog_errno(status);
