diff options
| author | Sunil Mushran <sunil.mushran@oracle.com> | 2011-05-04 10:27:10 -0700 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-05-13 11:26:37 -0700 |
| commit | 4da6dc293604f55d156148b8f60b94053e3195fc (patch) | |
| tree | 5357b1d04f4b2b3ab34f2d502a74ca7757ab6857 /fs/ocfs2 | |
| parent | 9a790ba1ec02bbae0933e7ebd576c0bc329e9796 (diff) | |
| download | op-kernel-dev-4da6dc293604f55d156148b8f60b94053e3195fc.zip op-kernel-dev-4da6dc293604f55d156148b8f60b94053e3195fc.tar.gz | |
ocfs2/dlm: Use negotiated o2dlm protocol version
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 >= 2.6.37 joins
a cluster with nodes having kernels < 2.6.37.
This only affects the o2cb cluster stack.
Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Reported-by: Jacek Stepniewski <Jacek.Stepniewski@agora.pl>
Acked-by: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Joel Becker <jlbec@evilplan.org>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/dlm/dlmdomain.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c index 7540a49..3b179d6 100644 --- 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); |
