22c22
< * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
---
> * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
235a236,239
> if (vd->vdev_fru != NULL)
> VERIFY(nvlist_add_string(nv, ZPOOL_CONFIG_FRU,
> vd->vdev_fru) == 0);
>
280c284
< if (vd->vdev_dtl.smo_object != 0)
---
> if (vd->vdev_dtl_smo.smo_object != 0)
282c286
< vd->vdev_dtl.smo_object) == 0);
---
> vd->vdev_dtl_smo.smo_object) == 0);
491c495
< vdev_boot_header_t *vb;
---
> char *pad2;
523,525d526
< ASSERT(reason != VDEV_LABEL_REMOVE ||
< vdev_inuse(vd, crtxg, reason, NULL, NULL));
<
636,645d636
< * Initialize boot block header.
< */
< vb = zio_buf_alloc(sizeof (vdev_boot_header_t));
< bzero(vb, sizeof (vdev_boot_header_t));
< vb->vb_magic = VDEV_BOOT_MAGIC;
< vb->vb_version = VDEV_BOOT_VERSION;
< vb->vb_offset = VDEV_BOOT_OFFSET;
< vb->vb_size = VDEV_BOOT_SIZE;
<
< /*
652a644,647
> /* Initialize the 2nd padding area. */
> pad2 = zio_buf_alloc(VDEV_PAD_SIZE);
> bzero(pad2, VDEV_PAD_SIZE);
>
664,666c659,666
< vdev_label_write(zio, vd, l, vb,
< offsetof(vdev_label_t, vl_boot_header),
< sizeof (vdev_boot_header_t), NULL, NULL, flags);
---
> /*
> * Skip the 1st padding area.
> * Zero out the 2nd padding area where it might have
> * left over data from previous filesystem format.
> */
> vdev_label_write(zio, vd, l, pad2,
> offsetof(vdev_label_t, vl_pad2),
> VDEV_PAD_SIZE, NULL, NULL, flags);
677a678
> zio_buf_free(pad2, VDEV_PAD_SIZE);
679d679
< zio_buf_free(vb, sizeof (vdev_boot_header_t));
707a708,712
> * For use by zdb and debugging purposes only
> */
> uint64_t ub_max_txg = UINT64_MAX;
>
> /*
744c749,750
< if (vdev_uberblock_compare(ub, ubbest) > 0)
---
> if (ub->ub_txg <= ub_max_txg &&
> vdev_uberblock_compare(ub, ubbest) > 0)
961c967
< zio_t *vio = zio_null(zio, spa,
---
> zio_t *vio = zio_null(zio, spa, NULL,