Re: [PATCH 0/2] ocfs2: harden heartbeat teardown races

Hi,

Joseph Qi <[email protected]> =E4=BA=8E2026=E5=B9=B47=E6=9C=8826=
=E6=97=A5=E5=91=A8=E6=97=A5 14:58=E5=86=99=E9=81=93=EF=BC=9A
>
> Not sure how it conflicts. The 2 patches can be applied cleanly in my
> devel tree, on top of my o2hb_region_pin fixes.
>
> Cen, could you please verify it on the latest linux-next?

I reproduced the reported failure using the exact baselines reported by Sas=
hiko:

linux-next/HEAD 4e5dfb7c84012007c3c7061126491bbc92d71bf1
HEAD            062871f1371b2e02a272ff5279c6479aff0a37ef

On both baselines, patch 1/2 applies successfully, while patch 2/2
fails in fs/ocfs2/cluster/heartbeat.c.

The failure is caused by a missing prerequisite rather than an
incompatibility with linux-next. This series depends on:

[PATCH v2] ocfs2/cluster: keep heartbeat local node stable
Message-Id: <[email protected]>

Without this prerequisite, the baseline still has the three-argument
form of o2hb_send_nego_msg(), while patch 2 assumes the four-argument
form introduced by the prerequisite. As a result, the three-way merge
conflicts.

After applying the prerequisite first, the 0/2 series applies cleanly
on Sashiko's linux-next baseline, commit 4e5dfb7c8401.

Best regards,
Cen Zhang