On Thu, May 20, 2021 at 11:21:30AM -0400, Josef Bacik wrote:

Josef Bacik (3):
  btrfs: always abort the transaction if we abort a trans handle

This one now added to misc-next.

  btrfs: add a btrfs_has_fs_error helper
  btrfs: do not infinite loop in data reclaim if we aborted

I can fix up the 2nd patch locally, it's basically only a rename but the
fs and transaction bits getting out of sync as mentioned could be a
problem (or not). Patch 3 depends on the 2nd so I'll keep both in
for-next for the time being.