diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 16:50:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 16:50:28 -0700 |
| commit | 3f80fbff5f1ef8a842bbe5343bbc9ddad883f25c (patch) | |
| tree | 259f5be0f203b5c7e97837a1957f461abcfef5d0 /fs/ocfs2/dlm/dlmdomain.c | |
| parent | fce519588acfac249e8fdc1f5016c73d617de315 (diff) | |
| parent | 24307aa1e707b31613be92deaba7990e16bc1aec (diff) | |
| download | kernel_samsung_tuna-3f80fbff5f1ef8a842bbe5343bbc9ddad883f25c.zip kernel_samsung_tuna-3f80fbff5f1ef8a842bbe5343bbc9ddad883f25c.tar.gz kernel_samsung_tuna-3f80fbff5f1ef8a842bbe5343bbc9ddad883f25c.tar.bz2 | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
configfs: Fix race between configfs_readdir() and configfs_d_iput()
configfs: Don't try to d_delete() negative dentries.
ocfs2/dlm: Target node death during resource migration leads to thread spin
ocfs2: Skip mount recovery for hard-ro mounts
ocfs2/cluster: Heartbeat mismatch message improved
ocfs2/cluster: Increase the live threshold for global heartbeat
ocfs2/dlm: Use negotiated o2dlm protocol version
ocfs2: skip existing hole when removing the last extent_rec in punching-hole codes.
ocfs2: Initialize data_ac (might be used uninitialized)
Diffstat (limited to 'fs/ocfs2/dlm/dlmdomain.c')
| -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); |