Merge tag 'for-7.4-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

Pull btrfs fixes from David Sterba:
 "A btrfs fixes. The ones that could have some user noticeable impact
  are enumerated, the rest is one-liners.

   - fix chattr failing on files with nodatasum and compress flags

   - fix inode defrag status with concurrent truncation so it's not
     skipped in defrag in the future

   - fix merging compressed extent in fiemap output

   - fix deleting wrong subvolume by id if it gets renamed during the
     ioctl

   - error handling fixes: sysfs, quotas, fs-verity, scrub, zoned mode"

* tag 'for-7.4-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: zoned: fix double free of bitmaps on clone failure
  btrfs: prevent deleting the wrong subvolume by ID
  btrfs: scrub: fix race between scrub and scrub progress ioctl
  btrfs: scrub: fix race leading to use-after-free in the scrub progress ioctl
  btrfs: scrub: fix lost wakeup and hang when cancelling a scrub that is finishing
  btrfs: scrub: fix lost error return value when scrubbing raid56 parity stripe
  btrfs: fix fiemap merging compressed extents
  btrfs: fix the fsverity callback where unexpected range is verified
  btrfs: verity: propagate orphan insertion errors when enabling verity
  btrfs: sysfs: restore NOFS context on early return in btrfs_sysfs_add_block_group_type()
  btrfs: defrag: prevent inode truncated to zero from not being defragged again
  btrfs: cleanup dirty_cowonly_roots during btrfs_free_fs_roots()
  btrfs: cleanup qgroup swapped blocks at root release
  btrfs: always remove quota_root from dirty_cowonly_roots
  btrfs: unwind device add when sysfs registration fails
  btrfs: fix chattr failing on nodatasum files that have the compress flag