Merge tag 'for-6.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
- 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
* tag 'for-6.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: open code folio_index() in btree_clear_folio_dirty_tag()
Revert "btrfs: canonicalize the device path before adding it"
btrfs: avoid NULL pointer dereference if no valid csum tree
btrfs: handle empty eb->folios in num_extent_folios()
btrfs: correct the order of prelim_ref arguments in btrfs__prelim_ref
btrfs: compression: adjust cb->compressed_folios allocation type
This commit is contained in:
@@ -1928,7 +1928,7 @@ DECLARE_EVENT_CLASS(btrfs__prelim_ref,
|
||||
TP_PROTO(const struct btrfs_fs_info *fs_info,
|
||||
const struct prelim_ref *oldref,
|
||||
const struct prelim_ref *newref, u64 tree_size),
|
||||
TP_ARGS(fs_info, newref, oldref, tree_size),
|
||||
TP_ARGS(fs_info, oldref, newref, tree_size),
|
||||
|
||||
TP_STRUCT__entry_btrfs(
|
||||
__field( u64, root_id )
|
||||
|
||||
Reference in New Issue
Block a user