History

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

Linus Torvalds committed 1 year ago

Commit 0d8d44d2 parents cccd033 38e54106 files · +9 −96Browse files

Showing the changes to include (1 of 6 files). Show all

Unified · Split

include/trace/events/btrfs.h+1−1
@@ -1928,7 +1928,7 @@ DECLARE_EVENT_CLASS(btrfs__prelim_ref, · 1927 unmodified lines
19281928 TP_PROTO(const struct btrfs_fs_info *fs_info,
19291929 const struct prelim_ref *oldref,
19301930 const struct prelim_ref *newref, u64 tree_size),
1931− TP_ARGS(fs_info, newref, oldref, tree_size),
1931+ TP_ARGS(fs_info, oldref, newref, tree_size),
19321932
19331933 TP_STRUCT__entry_btrfs(
19341934 __field( u64, root_id )

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t