]> granicus.if.org Git - zfs/commitdiff
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 16 Jun 2010 19:11:18 +0000 (12:11 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 16 Jun 2010 19:11:18 +0000 (12:11 -0700)
1  2 
cmd/zdb/zdb.c
module/zfs/vdev_label.c

diff --cc cmd/zdb/zdb.c
Simple merge
index e46120a3623d3410d5f50ab3fc327b258a9f0c1d,f7956799e99424cb10bc6e2ff2ce18def1011cd5..124caa37722c437ccfcd7755c63eff2978a48ac8
@@@ -600,10 -597,8 +600,10 @@@ vdev_label_init(vdev_t *vd, uint64_t cr
        char *buf;
        size_t buflen;
        int error;
-       uint64_t spare_guid = 0, l2cache_guid;
+       uint64_t spare_guid = 0, l2cache_guid = 0;
        int flags = ZIO_FLAG_CONFIG_WRITER | ZIO_FLAG_CANFAIL;
 +      int c, l;
 +      vdev_t *pvd;
  
        ASSERT(spa_config_held(spa, SCL_ALL, RW_WRITER) == SCL_ALL);