From: Junxiao Bi Date: Fri, 27 May 2016 21:27:16 +0000 (-0700) Subject: ocfs2: bump up o2cb network protocol version X-Git-Tag: v4.1.12-92~141^2~1 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cf0cccb54aaae5fafcae292a1bae739ed535037c;p=users%2Fjedix%2Flinux-maple.git ocfs2: bump up o2cb network protocol version Orabug: 23544119 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 Reviewed-by: Mark Fasheh Cc: Joel Becker Cc: Joseph Qi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds (cherry picked from commit 38b52efd218bf2a11a5b4a8f56052cee6684cfec) Signed-off-by: Junxiao Bi --- diff --git a/fs/ocfs2/cluster/tcp_internal.h b/fs/ocfs2/cluster/tcp_internal.h index b95e7df5b76ac..94b18369b1cc5 100644 --- a/fs/ocfs2/cluster/tcp_internal.h +++ b/fs/ocfs2/cluster/tcp_internal.h @@ -44,6 +44,9 @@ * 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. * @@ -75,7 +78,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 11ULL +#define O2NET_PROTOCOL_VERSION 12ULL struct o2net_handshake { __be64 protocol_version; __be64 connector_id;