Hi Linus, Please pull the following branch containing some fixes to the xfs code for 5.12-rc1. The most notable fix here prevents premature reuse of freed metadata blocks, and adding the ability to detect accidental nested transactions, which are not allowed here. This branch merges cleanly with upstream as of a few minutes ago. Please let me know if anything else strange happens during the merge process. --D The following changes since commit 1cd738b13ae9b29e03d6149f0246c61f76e81fcf: xfs: consider shutdown in bmapbt cursor delete assert (2021-02-11 08:46:38 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/xfs-5.12-merge-6 for you to fetch changes up to 756b1c343333a5aefcc26b0409f3fd16f72281bf: xfs: use current->journal_info for detecting transaction recursion (2021-02-25 08:07:04 -0800) ---------------------------------------------------------------- More new code for 5.12: - Restore a disused sysctl control knob that was inadvertently dropped during the merge window to avoid fstests regressions. - Don't speculatively release freed blocks from the busy list until we're actually allocating them, which fixes a rare log recovery regression. - Don't nest transactions when scanning for free space. - Add an idiot^Wmaintainer light to detect nested transactions. ;) ---------------------------------------------------------------- Brian Foster (1): xfs: don't reuse busy extents on extent trim Darrick J. Wong (2): xfs: restore speculative_cow_prealloc_lifetime sysctl xfs: don't nest transactions when scanning for eofblocks Dave Chinner (1): xfs: use current->journal_info for detecting transaction recursion Documentation/admin-guide/xfs.rst | 16 ++++++++++------ fs/iomap/buffered-io.c | 7 ------- fs/xfs/libxfs/xfs_btree.c | 12 ++++++++++-- fs/xfs/xfs_aops.c | 17 +++++++++++++++-- fs/xfs/xfs_extent_busy.c | 14 -------------- fs/xfs/xfs_sysctl.c | 35 ++++++++++++++--------------------- fs/xfs/xfs_trans.c | 33 +++++++++++++++------------------ fs/xfs/xfs_trans.h | 30 ++++++++++++++++++++++++++++++ 8 files changed, 94 insertions(+), 70 deletions(-)