From d1684019b45cb7b03f101d32be0f3c908ac3e5a5 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 18 Dec 2008 09:01:48 -0800 Subject: [PATCH 1/2] Move int out of for construct for c90 compliance --- module/zfs/dmu_objset.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c index 7981e06825..2e1e8f6928 100644 --- a/module/zfs/dmu_objset.c +++ b/module/zfs/dmu_objset.c @@ -843,6 +843,8 @@ dmu_objset_sync_dnodes(list_t *list, dmu_tx_t *tx) static void ready(zio_t *zio, arc_buf_t *abuf, void *arg) { + int i; + blkptr_t *bp = zio->io_bp; blkptr_t *bp_orig = &zio->io_bp_orig; objset_impl_t *os = arg; @@ -856,7 +858,7 @@ ready(zio_t *zio, arc_buf_t *abuf, void *arg) * Update rootbp fill count. */ bp->blk_fill = 1; /* count the meta-dnode */ - for (int i = 0; i < dnp->dn_nblkptr; i++) + for (i = 0; i < dnp->dn_nblkptr; i++) bp->blk_fill += dnp->dn_blkptr[i].blk_fill; if (zio->io_flags & ZIO_FLAG_IO_REWRITE) { From c37308fc2014773883146683a563ade51e94b319 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 18 Dec 2008 09:03:02 -0800 Subject: [PATCH 2/2] Resolve stat conflict with stat() --- module/zfs/dmu_objset.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c index 7981e06825..f4f2e6d506 100644 --- a/module/zfs/dmu_objset.c +++ b/module/zfs/dmu_objset.c @@ -960,11 +960,11 @@ dmu_objset_fsid_guid(objset_t *os) } void -dmu_objset_fast_stat(objset_t *os, dmu_objset_stats_t *stat) +dmu_objset_fast_stat(objset_t *os, dmu_objset_stats_t *st) { - stat->dds_type = os->os->os_phys->os_type; + st->dds_type = os->os->os_phys->os_type; if (os->os->os_dsl_dataset) - dsl_dataset_fast_stat(os->os->os_dsl_dataset, stat); + dsl_dataset_fast_stat(os->os->os_dsl_dataset, st); } void