diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c index 479e71de8c..997a382f10 100644 --- a/module/zfs/vdev.c +++ b/module/zfs/vdev.c @@ -132,8 +132,8 @@ vdev_get_min_asize(vdev_t *vd) void vdev_set_min_asize(vdev_t *vd) { - vd->vdev_min_asize = vdev_get_min_asize(vd); int c; + vd->vdev_min_asize = vdev_get_min_asize(vd); for (c = 0; c < vd->vdev_children; c++) vdev_set_min_asize(vd->vdev_child[c]); diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c index bae4cdcdc6..d8343d8d2f 100644 --- a/module/zfs/vdev_disk.c +++ b/module/zfs/vdev_disk.c @@ -531,8 +531,7 @@ vdev_disk_read_rootlabel(char *devpath, char *devid, nvlist_t **config) /* read vdev label */ offset = vdev_label_offset(size, i, 0); if (vdev_disk_physio(vd_lh, (caddr_t)label, - VDEV_SKIP_SIZE + VDEV_BOOT_HEADER_SIZE + - VDEV_PHYS_SIZE, offset, READ) != 0) + VDEV_SKIP_SIZE + VDEV_PHYS_SIZE, offset, READ) != 0) continue; if (nvlist_unpack(label->vl_vdev_phys.vp_nvlist,