Skip to contentSkip to conversation

Btrfs fixes for 7.4-rc2

GIT PULL Merged David Sterba 2 participants 2 messages Nov 7 – Nov 8 Btrfs file system

lore
Share & tools
lore

David Sterba

author maintainer
#0 lore raw

Hi,

please pull a few btrfs fixes. The ones that could have some user noticeable impact are enumerated, the rest is one-liners.

Please pull, thanks.

- 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

----------------------------------------------------------------
The following changes since commit 58e844c3ba387ceb0f527a6ba82aa50c81c4d7b7:

btrfs: fix use-after-free on quota enable allocation failure (2026-10-12 23:59:21 +0200)

are available in the Git repository at:

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

for you to fetch changes up to 8c66a6aa59a5df1d672d72b7cd379d897ff73200:

btrfs: zoned: fix double free of bitmaps on clone failure (2026-10-30 23:17:16 +0100)

----------------------------------------------------------------
Adarsh Das (1):
btrfs: unwind device add when sysfs registration fails

Filipe Manana (6):
btrfs: defrag: prevent inode truncated to zero from not being defragged again
btrfs: fix fiemap merging compressed extents
btrfs: scrub: fix lost error return value when scrubbing raid56 parity stripe
btrfs: scrub: fix lost wakeup and hang when cancelling a scrub that is finishing
btrfs: scrub: fix race leading to use-after-free in the scrub progress ioctl
btrfs: scrub: fix race between scrub and scrub progress ioctl

Hengyu Liang (1):
btrfs: fix chattr failing on nodatasum files that have the compress flag

Qu Wenruo (4):
btrfs: always remove quota_root from dirty_cowonly_roots
btrfs: cleanup qgroup swapped blocks at root release
btrfs: cleanup dirty_cowonly_roots during btrfs_free_fs_roots()
btrfs: fix the fsverity callback where unexpected range is verified

Thomas Fourier (1):
btrfs: zoned: fix double free of bitmaps on clone failure

guolingxing (3):
btrfs: sysfs: restore NOFS context on early return in btrfs_sysfs_add_block_group_type()
btrfs: verity: propagate orphan insertion errors when enabling verity
btrfs: prevent deleting the wrong subvolume by ID

 fs/btrfs/defrag.c    | 11 ++++++++++-
 fs/btrfs/disk-io.c   | 20 ++++++++++++++++++++
 fs/btrfs/extent_io.c |  2 +-
 fs/btrfs/fiemap.c    |  3 ++-
 fs/btrfs/ioctl.c     | 24 ++++++++++++++++++++++++
 fs/btrfs/qgroup.c    | 12 +++++++-----
 fs/btrfs/scrub.c     | 22 +++++++++++++++++-----
 fs/btrfs/sysfs.c     |  4 ++++
 fs/btrfs/verity.c    |  2 +-
 fs/btrfs/volumes.c   |  7 ++++++-
 fs/btrfs/zoned.c     |  5 +++++
 11 files changed, 97 insertions(+), 15 deletions(-)