zdb: replace label_t to zdb_label_t for reduce collisions

[mirror_zfs.git] / cmd / zdb / zdb.c

diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
index 5ef69790d9256353fd5a8096e080cc3b32c892a8..a60f0f255bff1cbb94e58abeb9f10d4965a634ef 100644 (file)
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@@ -793,9 +793,9 @@ dump_spacemap(objset_t *os, space_map_t *sm)
                return;
 
        (void) printf("space map object %llu:\n",
-           (longlong_t)sm->sm_phys->smp_object);
-       (void) printf("  smp_objsize = 0x%llx\n",
-           (longlong_t)sm->sm_phys->smp_objsize);
+           (longlong_t)sm->sm_object);
+       (void) printf("  smp_length = 0x%llx\n",
+           (longlong_t)sm->sm_phys->smp_length);
        (void) printf("  smp_alloc = 0x%llx\n",
            (longlong_t)sm->sm_phys->smp_alloc);
 
@@ -2854,17 +2854,17 @@ print_label_numbers(char *prefix, cksum_record_t *rec)
 
 #define        MAX_UBERBLOCK_COUNT (VDEV_UBERBLOCK_RING >> UBERBLOCK_SHIFT)
 
-typedef struct label {
+typedef struct zdb_label {
        vdev_label_t label;
        nvlist_t *config_nv;
        cksum_record_t *config;
        cksum_record_t *uberblocks[MAX_UBERBLOCK_COUNT];
        boolean_t header_printed;
        boolean_t read_failed;
-} label_t;
+} zdb_label_t;
 
 static void
-print_label_header(label_t *label, int l)
+print_label_header(zdb_label_t *label, int l)
 {
 
        if (dump_opt['q'])
@@ -2881,7 +2881,7 @@ print_label_header(label_t *label, int l)
 }
 
 static void
-dump_config_from_label(label_t *label, size_t buflen, int l)
+dump_config_from_label(zdb_label_t *label, size_t buflen, int l)
 {
        if (dump_opt['q'])
                return;
@@ -2900,7 +2900,7 @@ dump_config_from_label(label_t *label, size_t buflen, int l)
 #define        ZDB_MAX_UB_HEADER_SIZE 32
 
 static void
-dump_label_uberblocks(label_t *label, uint64_t ashift, int label_num)
+dump_label_uberblocks(zdb_label_t *label, uint64_t ashift, int label_num)
 {
 
        vdev_t vd;
@@ -3044,7 +3044,7 @@ static int
 dump_label(const char *dev)
 {
        char path[MAXPATHLEN];
-       label_t labels[VDEV_LABELS];
+       zdb_label_t labels[VDEV_LABELS];
        uint64_t psize, ashift;
        struct stat64 statbuf;
        boolean_t config_found = B_FALSE;
@@ -3109,7 +3109,7 @@ dump_label(const char *dev)
         * 3. Traverse all uberblocks and insert in uberblock tree.
         */
        for (int l = 0; l < VDEV_LABELS; l++) {
-               label_t *label = &labels[l];
+               zdb_label_t *label = &labels[l];
                char *buf = label->label.vl_vdev_phys.vp_nvlist;
                size_t buflen = sizeof (label->label.vl_vdev_phys.vp_nvlist);
                nvlist_t *config;
@@ -3172,7 +3172,7 @@ dump_label(const char *dev)
         * Dump the label and uberblocks.
         */
        for (int l = 0; l < VDEV_LABELS; l++) {
-               label_t *label = &labels[l];
+               zdb_label_t *label = &labels[l];
                size_t buflen = sizeof (label->label.vl_vdev_phys.vp_nvlist);
 
                if (label->read_failed == B_TRUE)
@@ -3697,7 +3697,6 @@ zdb_load_obsolete_counts(vdev_t *vd)
                space_map_t *prev_obsolete_sm = NULL;
                VERIFY0(space_map_open(&prev_obsolete_sm, spa->spa_meta_objset,
                    scip->scip_prev_obsolete_sm_object, 0, vd->vdev_asize, 0));
-               space_map_update(prev_obsolete_sm);
                vdev_indirect_mapping_load_obsolete_spacemap(vim, counts,
                    prev_obsolete_sm);
                space_map_close(prev_obsolete_sm);
@@ -3833,9 +3832,9 @@ zdb_leak_init_vdev_exclude_checkpoint(vdev_t *vd, zdb_cb_t *zcb)
 
        VERIFY0(space_map_open(&checkpoint_sm, spa_meta_objset(spa),
            checkpoint_sm_obj, 0, vd->vdev_asize, vd->vdev_ashift));
-       space_map_update(checkpoint_sm);
 
        VERIFY0(space_map_iterate(checkpoint_sm,
+           space_map_length(checkpoint_sm),
            checkpoint_sm_exclude_entry_cb, &cseea));
        space_map_close(checkpoint_sm);
 
@@ -4651,7 +4650,6 @@ verify_device_removal_feature_counts(spa_t *spa)
                            spa->spa_meta_objset,
                            scip->scip_prev_obsolete_sm_object,
                            0, vd->vdev_asize, 0));
-                       space_map_update(prev_obsolete_sm);
                        dump_spacemap(spa->spa_meta_objset, prev_obsolete_sm);
                        (void) printf("\n");
                        space_map_close(prev_obsolete_sm);
@@ -4933,7 +4931,6 @@ verify_checkpoint_vdev_spacemaps(spa_t *checkpoint, spa_t *current)
                VERIFY0(space_map_open(&checkpoint_sm, spa_meta_objset(current),
                    checkpoint_sm_obj, 0, current_vd->vdev_asize,
                    current_vd->vdev_ashift));
-               space_map_update(checkpoint_sm);
 
                verify_checkpoint_sm_entry_cb_arg_t vcsec;
                vcsec.vcsec_vd = ckpoint_vd;
@@ -4941,6 +4938,7 @@ verify_checkpoint_vdev_spacemaps(spa_t *checkpoint, spa_t *current)
                vcsec.vcsec_num_entries =
                    space_map_length(checkpoint_sm) / sizeof (uint64_t);
                VERIFY0(space_map_iterate(checkpoint_sm,
+                   space_map_length(checkpoint_sm),
                    verify_checkpoint_sm_entry_cb, &vcsec));
                if (dump_opt['m'] > 3)
                        dump_spacemap(current->spa_meta_objset, checkpoint_sm);
@@ -5100,7 +5098,6 @@ dump_leftover_checkpoint_blocks(spa_t *spa)
 
                VERIFY0(space_map_open(&checkpoint_sm, spa_meta_objset(spa),
                    checkpoint_sm_obj, 0, vd->vdev_asize, vd->vdev_ashift));
-               space_map_update(checkpoint_sm);
                dump_spacemap(spa->spa_meta_objset, checkpoint_sm);
                space_map_close(checkpoint_sm);
        }