From b2dcbdf490252c9476a9e2b1871cf90c40325bca Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 8 Jul 2009 09:04:21 -0700 Subject: [PATCH 1/2] Resolve a 2 new cases of for loop variable declared in for() --- cmd/ztest/ztest.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index d56cb03b51..bdb0416773 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -1218,6 +1218,8 @@ online_vdev(vdev_t *vd, void *arg) vdev_t * vdev_walk_tree(vdev_t *vd, vdev_t *(*func)(vdev_t *, void *), void *arg) { + uint_t c; + if (vd->vdev_ops->vdev_op_leaf) { if (func == NULL) return (vd); @@ -1225,7 +1227,7 @@ vdev_walk_tree(vdev_t *vd, vdev_t *(*func)(vdev_t *, void *), void *arg) return (func(vd, arg)); } - for (uint_t c = 0; c < vd->vdev_children; c++) { + for (c = 0; c < vd->vdev_children; c++) { vdev_t *cvd = vd->vdev_child[c]; if ((cvd = vdev_walk_tree(cvd, func, arg)) != NULL) return (cvd); From 58f5e63293535d543ec9f51a4cd43227a2001dff Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 8 Jul 2009 09:05:37 -0700 Subject: [PATCH 2/2] Resolve a 2 new cases of for loop variable declared in for() --- module/zfs/vdev_label.c | 1 + 1 file changed, 1 insertion(+) diff --git a/module/zfs/vdev_label.c b/module/zfs/vdev_label.c index b2f45d366e..b858edef18 100644 --- a/module/zfs/vdev_label.c +++ b/module/zfs/vdev_label.c @@ -508,6 +508,7 @@ vdev_label_init(vdev_t *vd, uint64_t crtxg, vdev_labeltype_t reason) uint64_t spare_guid, l2cache_guid; int flags = ZIO_FLAG_CONFIG_WRITER | ZIO_FLAG_CANFAIL; int c, l, n; + vdev_t *pvd; ASSERT(spa_config_held(spa, SCL_ALL, RW_WRITER) == SCL_ALL);