c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-13 19:50:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

zdb: replace label_t to zdb_label_t for reduce collisions

Browse Source 
with builds on illumos based platform we can see build issue
because label_t has been redefined.

for reduce build issues on others platforms we should rename
label_t to zdb_label_t.

Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Igor Kozhukhov <igor@dilos.org>
Closes #8397
This commit is contained in:
Igor K 2019-02-13 22:28:36 +03:00 committed by Brian Behlendorf
parent 65282ee9e0
commit cf89a4ec9d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/zdb/zdb.c
View File

@ -2854,17 +2854,17 @@ print_label_numbers(char *prefix, cksum_record_t *rec)
#define MAX_UBERBLOCK_COUNT (VDEV_UBERBLOCK_RING >> UBERBLOCK_SHIFT) #define MAX_UBERBLOCK_COUNT (VDEV_UBERBLOCK_RING >> UBERBLOCK_SHIFT)
typedef struct label { typedef struct zdb_label {
vdev_label_t label; vdev_label_t label;
nvlist_t *config_nv; nvlist_t *config_nv;
cksum_record_t *config; cksum_record_t *config;
cksum_record_t *uberblocks[MAX_UBERBLOCK_COUNT]; cksum_record_t *uberblocks[MAX_UBERBLOCK_COUNT];
boolean_t header_printed; boolean_t header_printed;
boolean_t read_failed; boolean_t read_failed;
} label_t; } zdb_label_t;
static void static void
print_label_header(label_t *label, int l) print_label_header(zdb_label_t *label, int l)
{ {
if (dump_opt['q']) if (dump_opt['q'])
@ -2881,7 +2881,7 @@ print_label_header(label_t *label, int l)
} }
static void 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']) if (dump_opt['q'])
return; return;
@ -2900,7 +2900,7 @@ dump_config_from_label(label_t *label, size_t buflen, int l)
#define ZDB_MAX_UB_HEADER_SIZE 32 #define ZDB_MAX_UB_HEADER_SIZE 32
static void 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; vdev_t vd;
@ -3044,7 +3044,7 @@ static int
dump_label(const char *dev) dump_label(const char *dev)
{ {
char path[MAXPATHLEN]; char path[MAXPATHLEN];
label_t labels[VDEV_LABELS]; zdb_label_t labels[VDEV_LABELS];
uint64_t psize, ashift; uint64_t psize, ashift;
struct stat64 statbuf; struct stat64 statbuf;
boolean_t config_found = B_FALSE; boolean_t config_found = B_FALSE;
@ -3109,7 +3109,7 @@ dump_label(const char *dev)
* 3. Traverse all uberblocks and insert in uberblock tree. * 3. Traverse all uberblocks and insert in uberblock tree.
*/ */
for (int l = 0; l < VDEV_LABELS; l++) { 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; char *buf = label->label.vl_vdev_phys.vp_nvlist;
size_t buflen = sizeof (label->label.vl_vdev_phys.vp_nvlist); size_t buflen = sizeof (label->label.vl_vdev_phys.vp_nvlist);
nvlist_t *config; nvlist_t *config;
@ -3172,7 +3172,7 @@ dump_label(const char *dev)
* Dump the label and uberblocks. * Dump the label and uberblocks.
*/ */
for (int l = 0; l < VDEV_LABELS; l++) { 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); size_t buflen = sizeof (label->label.vl_vdev_phys.vp_nvlist);
if (label->read_failed == B_TRUE) if (label->read_failed == B_TRUE)