From e4a407f29f412e92c1a37b8289fbf1487c18bb18 Mon Sep 17 00:00:00 2001 From: hoshinomori Date: Tue, 30 Sep 2025 07:38:52 +0800 Subject: [PATCH] range_tree: drop duplicate zfs_ prefix from rs_set_fill_raw Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: hoshinomori Closes #17800 --- include/sys/range_tree.h | 5 ++--- module/zfs/range_tree.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/sys/range_tree.h b/include/sys/range_tree.h index 0f6884682..0f6def36f 100644 --- a/include/sys/range_tree.h +++ b/include/sys/range_tree.h @@ -238,8 +238,7 @@ zfs_rs_set_end_raw(zfs_range_seg_t *rs, zfs_range_tree_t *rt, uint64_t end) } static inline void -zfs_zfs_rs_set_fill_raw(zfs_range_seg_t *rs, zfs_range_tree_t *rt, - uint64_t fill) +zfs_rs_set_fill_raw(zfs_range_seg_t *rs, zfs_range_tree_t *rt, uint64_t fill) { ASSERT3U(rt->rt_type, <=, ZFS_RANGE_SEG_NUM_TYPES); switch (rt->rt_type) { @@ -277,7 +276,7 @@ static inline void zfs_rs_set_fill(zfs_range_seg_t *rs, zfs_range_tree_t *rt, uint64_t fill) { ASSERT(IS_P2ALIGNED(fill, 1ULL << rt->rt_shift)); - zfs_zfs_rs_set_fill_raw(rs, rt, fill >> rt->rt_shift); + zfs_rs_set_fill_raw(rs, rt, fill >> rt->rt_shift); } typedef void zfs_range_tree_func_t(void *arg, uint64_t start, uint64_t size); diff --git a/module/zfs/range_tree.c b/module/zfs/range_tree.c index ea2d2c722..d73195f1a 100644 --- a/module/zfs/range_tree.c +++ b/module/zfs/range_tree.c @@ -585,7 +585,7 @@ zfs_range_tree_remove_impl(zfs_range_tree_t *rt, uint64_t start, uint64_t size, * the size, since we do not support removing partial segments * of range trees with gaps. */ - zfs_zfs_rs_set_fill_raw(rs, rt, zfs_rs_get_end_raw(rs, rt) - + zfs_rs_set_fill_raw(rs, rt, zfs_rs_get_end_raw(rs, rt) - zfs_rs_get_start_raw(rs, rt)); zfs_range_tree_stat_incr(rt, &rs_tmp);