On 09/20/2016 02:57 AM, Andrew Morton wrote: > On Sun, 18 Sep 2016 23:32:34 +0800 Junxiao Bi <junxiao.bi@xxxxxxxxxx> wrote: > >> Hi Andrew, >> >> Please drop this patch, it had been merged by mainline. > > Confused. I'm not seeing this in minaline. Sorry, my fault. Something wrong in my local repo. Now it is merged. Thanks, Junxiao. > >> Thanks, >> Junxiao. >>> ___ 2016___9___15____________6:45___akpm@xxxxxxxxxxxxxxxxxxxx _________ >>> >>> >>> The patch titled >>> Subject: Revert "ocfs2: bump up o2cb network protocol version" >>> has been added to the -mm tree. Its filename is >>> revert-ocfs2-bump-up-o2cb-network-protocol-version.patch >>> >>> This patch should soon appear at >>> http://ozlabs.org/~akpm/mmots/broken-out/revert-ocfs2-bump-up-o2cb-network-protocol-version.patch >>> and later at >>> http://ozlabs.org/~akpm/mmotm/broken-out/revert-ocfs2-bump-up-o2cb-network-protocol-version.patch >>> >>> Before you just go and hit "reply", please: >>> a) Consider who else should be cc'ed >>> b) Prefer to cc a suitable mailing list as well >>> c) Ideally: find the original patch on the mailing list and do a >>> reply-to-all to that, adding suitable additional cc's >>> >>> *** Remember to use Documentation/SubmitChecklist when testing your code *** >>> >>> The -mm tree is included into linux-next and is updated >>> there every 3-4 working days >>> >>> ------------------------------------------------------ >>> From: Junxiao Bi <junxiao.bi@xxxxxxxxxx> >>> Subject: Revert "ocfs2: bump up o2cb network protocol version" >>> >>> This reverts commit 38b52efd218bf ("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: 38b52efd218bf ("ocfs2: bump up o2cb network protocol version") >>> Link: http://lkml.kernel.org/r/1471396924-10375-1-git-send-email-junxiao.bi@xxxxxxxxxx >>> Signed-off-by: Junxiao Bi <junxiao.bi@xxxxxxxxxx> >>> Cc: Mark Fasheh <mfasheh@xxxxxxx> >>> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> >>> Cc: Joseph Qi <joseph.qi@xxxxxxxxxx> >>> Cc: <stable@xxxxxxxxxxxxxxx> >>> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> >>> --- >>> >>> fs/ocfs2/cluster/tcp_internal.h | 5 +---- >>> 1 file changed, 1 insertion(+), 4 deletions(-) >>> >>> diff -puN fs/ocfs2/cluster/tcp_internal.h~revert-ocfs2-bump-up-o2cb-network-protocol-version fs/ocfs2/cluster/tcp_internal.h >>> --- a/fs/ocfs2/cluster/tcp_internal.h~revert-ocfs2-bump-up-o2cb-network-protocol-version >>> +++ a/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; >>> _ >>> >>> Patches currently in -mm which might be from junxiao.bi@xxxxxxxxxx are >>> >>> ocfs2-fix-trans-extend-while-flush-truncate-log.patch >>> ocfs2-fix-trans-extend-while-free-cached-blocks.patch >>> revert-ocfs2-bump-up-o2cb-network-protocol-version.patch >>> >> -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html