[PATCH v2 0/2] Some block rsv fixes

[Josef Bacik <josef@toxicpanda.com>]

v1->v2:
- change the logic to max(1, root level), as generally we do not walk down into
  level 0 for the merge, with the exception for root level == 0.

--- Original email ---

Hello,

Nikolay has noticed that -o enospc_debug was getting some warnings in
btrfs_use_block_rsv() on some tests.  I dug into them and one class is easy to
fix as it's a straight regression.  The other one is going to require some more
debugging, so in the meantime here's the two patches I have so far that can be
merged.  The first is just to make my life easier when debugging these problems,
and the second is the actual regression fix.  It should probably be tagged for
stable as well since the regression was backported to stable.  Thanks,

Josef

Josef Bacik (2):
  btrfs: print the block rsv type when we fail our reservation
  btrfs: fix min reserved size calculation in merge_reloc_root

 fs/btrfs/block-rsv.c  | 3 ++-
 fs/btrfs/relocation.c | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

-- 
2.26.2