From 6133ebac9a687653a9f3979146cde0b63ac93d6b Mon Sep 17 00:00:00 2001 From: Junxiao Bi Date: Thu, 30 Jun 2016 16:50:39 +0800 Subject: [PATCH] Revert "ocfs2: bump up o2cb network protocol version" This reverts commit d5eebd62353e9c1434951436c4d1d8d7a636c17d. This commit made rolling upgrade fail. When one node is upgraded to new version with this commit, the remaining nodes will fail to establish connections to it, then vms on the remaining nodes can't be live migrated to that node. This will cause an outage. Orabug: 24292852 Signed-off-by: Junxiao Bi --- fs/ocfs2/cluster/tcp_internal.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/ocfs2/cluster/tcp_internal.h b/fs/ocfs2/cluster/tcp_internal.h index 94b18369b1cc..b95e7df5b76a 100644 --- a/fs/ocfs2/cluster/tcp_internal.h +++ b/fs/ocfs2/cluster/tcp_internal.h @@ -44,9 +44,6 @@ * version here in tcp_internal.h should not need to be bumped for * filesystem locking changes. * - * New in version 12 - * - Negotiate hb timeout when storage is down. - * * New in version 11 * - Negotiation of filesystem locking in the dlm join. * @@ -78,7 +75,7 @@ * - full 64 bit i_size in the metadata lock lvbs * - introduction of "rw" lock and pushing meta/data locking down */ -#define O2NET_PROTOCOL_VERSION 12ULL +#define O2NET_PROTOCOL_VERSION 11ULL struct o2net_handshake { __be64 protocol_version; __be64 connector_id; -- 2.50.1