Hi folks, The for-next branch of the xfs-linux repository at: git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git has just been REBASED Against v6.16-rc7 This contains no new patches, but cleans up the tree for the merge window, removing unneeded merge commits and fixing dependencies. The new head of the for-next branch is commit: ded74fddcaf6 xfs: don't use a xfs_log_iovec for ri_buf in log recovery The 44 commits below are those staged for the merge window: Alan Huang (1): [8c10b04f9fc1] xfs: Remove unused label in xfs_dax_notify_dev_failure Christoph Hellwig (19): [736b576d4d98] xfs: use xfs_trans_reserve_more in xfs_trans_reserve_more_inode [f1cc16e1547e] xfs: don't use xfs_trans_reserve in xfs_trans_reserve_more [83a80e95e797] xfs: decouple xfs_trans_alloc_empty from xfs_trans_alloc [60538b0b54b3] xfs: don't use xfs_trans_reserve in xfs_trans_roll [d8e1ea43e5a3] xfs: return the allocated transaction from xfs_trans_alloc_empty [92176e32464c] xfs: return the allocated transaction from xchk_trans_alloc_empty [e4a1df35be5d] xfs: remove xrep_trans_{alloc,cancel}_hook_dummy [ff67c13dc8f0] xfs: remove the xlog_ticket_t typedef [59655147ec34] xfs: improve the xg_active_ref check in xfs_group_free [90b1bda80ece] xfs: use a uint32_t to cache i_used_blocks in xfs_init_zone [329b996d9210] xfs: rename oz_write_pointer to oz_allocated [86e6ddf1d0ba] xfs: stop passing an inode to the zone space reservation helpers [7cbbfd27a929] xfs: improve the comments in xfs_max_open_zones [60e02f956d77] xfs: improve the comments in xfs_select_zone_nowait [469342210afe] xfs: don't pass the old lv to xfs_cil_prepare_item [01774798c271] xfs: cleanup the ordered item logic in xlog_cil_insert_format_items [e870cbe6fa7c] xfs: use better names for size members in xfs_log_vec [8bf931f99e84] xfs: don't use a xfs_log_iovec for attr_item names and values [ded74fddcaf6] xfs: don't use a xfs_log_iovec for ri_buf in log recovery Fedor Pchelkin (6): [edce172444b4] xfs: rename diff_two_keys routines [82b63ee16001] xfs: rename key_diff routines [3b583adf55c6] xfs: refactor cmp_two_keys routines to take advantage of cmp_int() [734b871d6cf7] xfs: refactor cmp_key_with_cur routines to take advantage of cmp_int() [2717eb351855] xfs: use a proper variable name and type for storing a comparison result [ce6cce46aff7] xfs: refactor xfs_btree_diff_two_ptrs() to take advantage of cmp_int() Pranav Tyagi (1): [f4a3f01e8e45] fs/xfs: replace strncpy with memtostr_pad() Steven Rostedt (17): [091e9451d0bd] xfs: remove unused trace event xfs_attr_remove_iter_return [32177ab8ba5f] xfs: remove unused event xlog_iclog_want_sync [6f7080bd932f] xfs: remove unused event xfs_ioctl_clone [8c54845c3a02] xfs: remove unused xfs_reflink_compare_extents events [b3b5015d3454] xfs: remove unused trace event xfs_attr_rmtval_set [b54480c3b10d] xfs: remove unused xfs_attr events [ea26bbc7795b] xfs: remove unused event xfs_attr_node_removename [237f8e885136] xfs: remove unused event xfs_alloc_near_error [f1100605590a] xfs: remove unused event xfs_alloc_near_nominleft [88fd451594a6] xfs: remove unused event xfs_pagecache_inval [9a8a536fe5a8] xfs: remove usused xfs_end_io_direct events [31b98ef2403f] xfs: only create event xfs_file_compat_ioctl when CONFIG_COMPAT is configure [e0a05579b2b6] xfs: change xfs_xattr_class from a TRACE_EVENT() to DECLARE_EVENT_CLASS() [b9adb86b9045] xfs: remove unused trace event xfs_dqreclaim_dirty [3c4052cb9f7e] xfs: remove unused trace event xfs_log_cil_return [2b74404188b5] xfs: remove unused trace event xfs_discard_rtrelax [75fe259ff7f6] xfs: remove unused trace event xfs_reflink_cow_enospc Code Diffstat: fs/xfs/libxfs/xfs_alloc_btree.c | 52 ++++----- fs/xfs/libxfs/xfs_bmap_btree.c | 32 ++---- fs/xfs/libxfs/xfs_btree.c | 33 +++--- fs/xfs/libxfs/xfs_btree.h | 41 +++---- fs/xfs/libxfs/xfs_format.h | 2 +- fs/xfs/libxfs/xfs_group.c | 3 +- fs/xfs/libxfs/xfs_ialloc_btree.c | 24 ++-- fs/xfs/libxfs/xfs_log_recover.h | 4 +- fs/xfs/libxfs/xfs_refcount.c | 4 +- fs/xfs/libxfs/xfs_refcount_btree.c | 18 +-- fs/xfs/libxfs/xfs_rmap_btree.c | 67 ++++-------- fs/xfs/libxfs/xfs_rtrefcount_btree.c | 18 +-- fs/xfs/libxfs/xfs_rtrmap_btree.c | 67 ++++-------- fs/xfs/scrub/btree.c | 2 +- fs/xfs/scrub/common.c | 7 +- fs/xfs/scrub/common.h | 2 +- fs/xfs/scrub/dir_repair.c | 8 +- fs/xfs/scrub/fscounters.c | 3 +- fs/xfs/scrub/metapath.c | 4 +- fs/xfs/scrub/nlinks.c | 8 +- fs/xfs/scrub/nlinks_repair.c | 4 +- fs/xfs/scrub/parent_repair.c | 12 +- fs/xfs/scrub/quotacheck.c | 4 +- fs/xfs/scrub/rcbag_btree.c | 38 ++----- fs/xfs/scrub/repair.c | 36 ------ fs/xfs/scrub/repair.h | 4 - fs/xfs/scrub/rmap_repair.c | 14 +-- fs/xfs/scrub/rtrmap_repair.c | 14 +-- fs/xfs/scrub/scrub.c | 5 +- fs/xfs/scrub/trace.h | 2 +- fs/xfs/xfs_attr_item.c | 148 ++++++++++++------------- fs/xfs/xfs_attr_item.h | 8 +- fs/xfs/xfs_bmap_item.c | 18 +-- fs/xfs/xfs_buf_item.c | 8 +- fs/xfs/xfs_buf_item.h | 2 +- fs/xfs/xfs_buf_item_recover.c | 38 +++---- fs/xfs/xfs_discard.c | 12 +- fs/xfs/xfs_dquot_item_recover.c | 20 ++-- fs/xfs/xfs_exchmaps_item.c | 8 +- fs/xfs/xfs_extfree_item.c | 59 +++++----- fs/xfs/xfs_file.c | 24 ++-- fs/xfs/xfs_fsmap.c | 4 +- fs/xfs/xfs_icache.c | 5 +- fs/xfs/xfs_icreate_item.c | 2 +- fs/xfs/xfs_inode.c | 7 +- fs/xfs/xfs_inode_item.c | 6 +- fs/xfs/xfs_inode_item.h | 4 +- fs/xfs/xfs_inode_item_recover.c | 26 ++--- fs/xfs/xfs_ioctl.c | 3 +- fs/xfs/xfs_iops.c | 4 +- fs/xfs/xfs_itable.c | 18 +-- fs/xfs/xfs_iwalk.c | 11 +- fs/xfs/xfs_log.c | 16 +-- fs/xfs/xfs_log.h | 16 +-- fs/xfs/xfs_log_cil.c | 71 ++++++------ fs/xfs/xfs_log_priv.h | 4 +- fs/xfs/xfs_log_recover.c | 16 +-- fs/xfs/xfs_notify_failure.c | 6 +- fs/xfs/xfs_qm.c | 10 +- fs/xfs/xfs_refcount_item.c | 34 +++--- fs/xfs/xfs_rmap_item.c | 34 +++--- fs/xfs/xfs_rtalloc.c | 13 +-- fs/xfs/xfs_trace.h | 80 +------------- fs/xfs/xfs_trans.c | 207 ++++++++++++++++------------------- fs/xfs/xfs_trans.h | 4 +- fs/xfs/xfs_zone_alloc.c | 45 ++++---- fs/xfs/xfs_zone_alloc.h | 4 +- fs/xfs/xfs_zone_gc.c | 18 ++- fs/xfs/xfs_zone_info.c | 2 +- fs/xfs/xfs_zone_priv.h | 16 +-- fs/xfs/xfs_zone_space_resv.c | 17 +-- 71 files changed, 636 insertions(+), 944 deletions(-)