aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJunxiao Bi <junxiao.bi@oracle.com>2016-05-27 17:27:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-27 17:49:37 -0400
commit38b52efd218bf2a11a5b4a8f56052cee6684cfec (patch)
tree638f3c56c53045cc1d2b2ac64d6a25264fac8bc6 /fs
parent6633ca573165e000867e50caf94f60a75399b68b (diff)
ocfs2: bump up o2cb network protocol version
Two new messages are added to support negotiating hb timeout. Stop nodes frmo talking an old version to mount as they will cause the negotiation to fail. Link: http://lkml.kernel.org/r/1464231615-27939-1-git-send-email-junxiao.bi@oracle.com Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com> Reviewed-by: Mark Fasheh <mfasheh@suse.de> Cc: Joel Becker <jlbec@evilplan.org> Cc: Joseph Qi <joseph.qi@huawei.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/cluster/tcp_internal.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/ocfs2/cluster/tcp_internal.h b/fs/ocfs2/cluster/tcp_internal.h
index b95e7df5b76a..94b18369b1cc 100644
--- a/fs/ocfs2/cluster/tcp_internal.h
+++ b/fs/ocfs2/cluster/tcp_internal.h
@@ -44,6 +44,9 @@
44 * version here in tcp_internal.h should not need to be bumped for 44 * version here in tcp_internal.h should not need to be bumped for
45 * filesystem locking changes. 45 * filesystem locking changes.
46 * 46 *
47 * New in version 12
48 * - Negotiate hb timeout when storage is down.
49 *
47 * New in version 11 50 * New in version 11
48 * - Negotiation of filesystem locking in the dlm join. 51 * - Negotiation of filesystem locking in the dlm join.
49 * 52 *
@@ -75,7 +78,7 @@
75 * - full 64 bit i_size in the metadata lock lvbs 78 * - full 64 bit i_size in the metadata lock lvbs
76 * - introduction of "rw" lock and pushing meta/data locking down 79 * - introduction of "rw" lock and pushing meta/data locking down
77 */ 80 */
78#define O2NET_PROTOCOL_VERSION 11ULL 81#define O2NET_PROTOCOL_VERSION 12ULL
79struct o2net_handshake { 82struct o2net_handshake {
80 __be64 protocol_version; 83 __be64 protocol_version;
81 __be64 connector_id; 84 __be64 connector_id;