On Tue, Jun 7, 2022 at 12:30 AM Dave Chinner <david@xxxxxxxxxxxxx> wrote: > > On Mon, Jun 06, 2022 at 05:32:55PM +0300, Amir Goldstein wrote: > > From: Dave Chinner <dchinner@xxxxxxxxxx> > > > > commit 56486f307100e8fc66efa2ebd8a71941fa10bf6f upstream. > > > > xfs/538 on a 1kB block filesystem failed with this assert: > > > > XFS: Assertion failed: cur->bc_btnum != XFS_BTNUM_BMAP || cur->bc_ino.allocated == 0 || xfs_is_shutdown(cur->bc_mp), file: fs/xfs/libxfs/xfs_btree.c, line: 448 > > You haven't mentioned that you combined a second upstream > commit into this patch to fix the bug in this commit..... > I am confused. patch [5.10 7/8] xfs: consider shutdown in bmapbt cursor delete assert is the patch that I backported from 5.12 and posted for review. This patch [5.10 8/8] is the patch from 5.19-rc1 that you pointed out that I should take to fix the bug in patch [5.10 7/8]. The upstream commits correspond to the original commits each. If I missed anything, please correct me and I will fix it. Thanks, Amir.