From 43af29de5fefcac232f1f1f26853efd64b11430e Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 9 Jul 2009 10:19:02 -0700 Subject: [PATCH 1/2] Type int accidentally not declared at the top of the function. --- module/zfs/vdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c index 5f268c66de..5a3aabbad4 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]); From 2cc278c96f64ee32a8af43f439c9389d2524b182 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 9 Jul 2009 10:30:06 -0700 Subject: [PATCH 2/2] This change looks to have been made due to Sun bug 6803822, but it's not exactly clear to me why. Regardless I'm taking it. --- module/zfs/vdev_disk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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,