Skip to contentSkip to conversation

Btrfs fixes for 6.15-rc6

GIT PULL Merged David Sterba 2 participants 2 messages May 6, 2025 Btrfs file system

lore
Share & tools
lore

David Sterba

author maintainer
#0 lore raw

Hi,

a few more fixes, minor updates and one revert. Please pull, thanks.

- revert device path canonicalization, this does not work as intended with namespaces and is not reliable in all setups

- fix crash in scrub when checksum tree is not valid, e.g. when mounted with rescue=ignoredatacsums

- fix crash when tracepoint btrfs_prelim_ref_insert is enabled

- other minor fixups
- open code folio_index(), meant to be used in MM code
- use matching type for sizeof in compression allocation

----------------------------------------------------------------
The following changes since commit e08e49d986f82c30f42ad0ed43ebbede1e1e3739:

btrfs: adjust subpage bit start based on sectorsize (2025-04-23 08:42:10 +0200)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git tags/for-6.15-rc5-tag

for you to fetch changes up to 38e541051e1d19e8b1479a6af587a7884653e041:

btrfs: open code folio_index() in btree_clear_folio_dirty_tag() (2025-05-02 13:20:56 +0200)

----------------------------------------------------------------
Boris Burkov (1):

      btrfs: handle empty eb->folios in num_extent_folios()

Goldwyn Rodrigues (1):
btrfs: correct the order of prelim_ref arguments in btrfs__prelim_ref

Kairui Song (1):
btrfs: open code folio_index() in btree_clear_folio_dirty_tag()

Kees Cook (1):

      btrfs: compression: adjust cb->compressed_folios allocation type

Qu Wenruo (2):
btrfs: avoid NULL pointer dereference if no valid csum tree Revert "btrfs: canonicalize the device path before adding it"

 fs/btrfs/compression.c       |  2 +-
 fs/btrfs/extent_io.c         |  4 +-
 fs/btrfs/extent_io.h         |  2 +
 fs/btrfs/scrub.c             |  4 +-
 fs/btrfs/volumes.c           | 91 +-------------------------------------------
 include/trace/events/btrfs.h |  2 +-
 6 files changed, 9 insertions(+), 96 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Tue, 6 May 2025 16:06:18 +0200:

The pull request you sent on Tue, 6 May 2025 16:06:18 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git tags/for-6.15-rc5-tag

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/0d8d44db295ccad20052d6301ef49ff01fb8ae2d

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html