Skip to content

Commit 63b52c4

Browse files
biger410torvalds
authored andcommitted
Revert "ocfs2: bump up o2cb network protocol version"
This reverts commit 38b52ef ("ocfs2: bump up o2cb network protocol version"). 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 the application like VMs on the remaining nodes can't be live migrated to the upgraded one. This will cause an outage. Since negotiate hb timeout behavior didn't change without this commit, so revert it. Fixes: 38b52ef ("ocfs2: bump up o2cb network protocol version") Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Junxiao Bi <[email protected]> Cc: Mark Fasheh <[email protected]> Cc: Joel Becker <[email protected]> Cc: Joseph Qi <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent d21c353 commit 63b52c4

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

fs/ocfs2/cluster/tcp_internal.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
* version here in tcp_internal.h should not need to be bumped for
4545
* filesystem locking changes.
4646
*
47-
* New in version 12
48-
* - Negotiate hb timeout when storage is down.
49-
*
5047
* New in version 11
5148
* - Negotiation of filesystem locking in the dlm join.
5249
*
@@ -78,7 +75,7 @@
7875
* - full 64 bit i_size in the metadata lock lvbs
7976
* - introduction of "rw" lock and pushing meta/data locking down
8077
*/
81-
#define O2NET_PROTOCOL_VERSION 12ULL
78+
#define O2NET_PROTOCOL_VERSION 11ULL
8279
struct o2net_handshake {
8380
__be64 protocol_version;
8481
__be64 connector_id;

0 commit comments

Comments
 (0)