Rename range_tree_verify to range_tree_verify_not_present

The range_tree_verify function looks for a segment in a
range tree and panics if the segment is present on the
tree. This patch gives the function a more descriptive
name.

Reviewed-by: Matt Ahrens <mahrens@delphix.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Serapheim Dimitropoulos <serapheim@delphix.com>
Closes #8327

diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
index 869b7a07ff34d774cf2189e8418a5503949efedc..c6707325c016df6469ac5ef1f7042be2459535e6 100644 (file)
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@@ -4858,7 +4858,8 @@ verify_checkpoint_sm_entry_cb(space_map_entry_t *sme, void *arg)
         * their respective ms_allocateable trees should not contain them.
         */
        mutex_enter(&ms->ms_lock);
-       range_tree_verify(ms->ms_allocatable, sme->sme_offset, sme->sme_run);
+       range_tree_verify_not_present(ms->ms_allocatable,
+           sme->sme_offset, sme->sme_run);
        mutex_exit(&ms->ms_lock);
 
        return (0);
@@ -5009,7 +5010,7 @@ verify_checkpoint_ms_spacemaps(spa_t *checkpoint, spa_t *current)
                         * are part of the checkpoint were freed by mistake.
                         */
                        range_tree_walk(ckpoint_msp->ms_allocatable,
-                           (range_tree_func_t *)range_tree_verify,
+                           (range_tree_func_t *)range_tree_verify_not_present,
                            current_msp->ms_allocatable);
                }
        }

diff --git a/include/sys/range_tree.h b/include/sys/range_tree.h
index 7f79786f56dd86aaccbae41a430577ddbca1521c..ae1a0c323de3e5c5cbde2d2b82c72441ca5edde8 100644 (file)
--- a/include/sys/range_tree.h
+++ b/include/sys/range_tree.h
@@ -89,12 +89,13 @@ range_tree_t *range_tree_create_impl(range_tree_ops_t *ops, void *arg,
 range_tree_t *range_tree_create(range_tree_ops_t *ops, void *arg);
 void range_tree_destroy(range_tree_t *rt);
 boolean_t range_tree_contains(range_tree_t *rt, uint64_t start, uint64_t size);
+void range_tree_verify_not_present(range_tree_t *rt,
+    uint64_t start, uint64_t size);
 range_seg_t *range_tree_find(range_tree_t *rt, uint64_t start, uint64_t size);
 void range_tree_resize_segment(range_tree_t *rt, range_seg_t *rs,
     uint64_t newstart, uint64_t newsize);
 uint64_t range_tree_space(range_tree_t *rt);
 boolean_t range_tree_is_empty(range_tree_t *rt);
-void range_tree_verify(range_tree_t *rt, uint64_t start, uint64_t size);
 void range_tree_swap(range_tree_t **rtsrc, range_tree_t **rtdst);
 void range_tree_stat_verify(range_tree_t *rt);
 uint64_t range_tree_min(range_tree_t *rt);

diff --git a/module/zfs/metaslab.c b/module/zfs/metaslab.c
index 20e7f0ed38e0a3130919831ff22b00e518744579..aeca0ed20faf52cea18f4835f1da66d1b7890745 100644 (file)
--- a/module/zfs/metaslab.c
+++ b/module/zfs/metaslab.c
@@ -4256,14 +4256,16 @@ metaslab_check_free_impl(vdev_t *vd, uint64_t offset, uint64_t size)
        msp = vd->vdev_ms[offset >> vd->vdev_ms_shift];
 
        mutex_enter(&msp->ms_lock);
-       if (msp->ms_loaded)
-               range_tree_verify(msp->ms_allocatable, offset, size);
+       if (msp->ms_loaded) {
+               range_tree_verify_not_present(msp->ms_allocatable,
+                   offset, size);
+       }
 
-       range_tree_verify(msp->ms_freeing, offset, size);
-       range_tree_verify(msp->ms_checkpointing, offset, size);
-       range_tree_verify(msp->ms_freed, offset, size);
+       range_tree_verify_not_present(msp->ms_freeing, offset, size);
+       range_tree_verify_not_present(msp->ms_checkpointing, offset, size);
+       range_tree_verify_not_present(msp->ms_freed, offset, size);
        for (int j = 0; j < TXG_DEFER_SIZE; j++)
-               range_tree_verify(msp->ms_defer[j], offset, size);
+               range_tree_verify_not_present(msp->ms_defer[j], offset, size);
        mutex_exit(&msp->ms_lock);
 }
 

diff --git a/module/zfs/range_tree.c b/module/zfs/range_tree.c
index 2181a92df5e3e18e759b06065ce29d16f7ab8ffa..1a31c11292525c1f703befe2c67fb45ffa342083 100644 (file)
--- a/module/zfs/range_tree.c
+++ b/module/zfs/range_tree.c
@@ -511,13 +511,11 @@ range_tree_find(range_tree_t *rt, uint64_t start, uint64_t size)
 }
 
 void
-range_tree_verify(range_tree_t *rt, uint64_t off, uint64_t size)
+range_tree_verify_not_present(range_tree_t *rt, uint64_t off, uint64_t size)
 {
-       range_seg_t *rs;
-
-       rs = range_tree_find(rt, off, size);
+       range_seg_t *rs = range_tree_find(rt, off, size);
        if (rs != NULL)
-               panic("freeing free block; rs=%p", (void *)rs);
+               panic("segment already in tree; rs=%p", (void *)rs);
 }
 
 boolean_t