[0/7] make btrfs/153 sucessful on 5.4.y

Message

Anand Jain Aug. 13, 2021, 9:55 a.m. UTC

Patch 1-2 and 5 helps to fix the conflicts smoothly.
Patch 3-4 and 6 fixes the regression as reported by the
                test case btrfs/153 and comes from the below patch-set
                (btrfs: qgroup: Fix the long-existing regression of btrfs/153)
Patch 7 fixes lockdep Warning as in the commit log now reported by
the test case btrfs/153 on 5.4.y

Filipe Manana (1):
  btrfs: fix lockdep splat when enabling and disabling qgroups

Nikolay Borisov (2):
  btrfs: make qgroup_free_reserved_data take btrfs_inode
  btrfs: make btrfs_qgroup_reserve_data take btrfs_inode

Qu Wenruo (4):
  btrfs: qgroup: allow to unreserve range without releasing other ranges
  btrfs: qgroup: try to flush qgroup space when we get -EDQUOT
  btrfs: transaction: Cleanup unused TRANS_STATE_BLOCKED
  btrfs: qgroup: remove ASYNC_COMMIT mechanism in favor of reserve
    retry-after-EDQUOT

 fs/btrfs/ctree.h          |  13 +-
 fs/btrfs/delalloc-space.c |   2 +-
 fs/btrfs/disk-io.c        |   4 +-
 fs/btrfs/file.c           |   7 +-
 fs/btrfs/qgroup.c         | 308 ++++++++++++++++++++++++++++----------
 fs/btrfs/qgroup.h         |   2 +-
 fs/btrfs/transaction.c    |  16 +-
 fs/btrfs/transaction.h    |  15 --
 8 files changed, 246 insertions(+), 121 deletions(-)

Comments

Greg KH Aug. 13, 2021, 10:18 a.m. UTC | #1

On Fri, Aug 13, 2021 at 05:55:23PM +0800, Anand Jain wrote:
> Patch 1-2 and 5 helps to fix the conflicts smoothly.
> Patch 3-4 and 6 fixes the regression as reported by the
>                 test case btrfs/153 and comes from the below patch-set
>                 (btrfs: qgroup: Fix the long-existing regression of btrfs/153)
> Patch 7 fixes lockdep Warning as in the commit log now reported by
> the test case btrfs/153 on 5.4.y

All queued up, thanks!

greg k-h