]> granicus.if.org Git - zfs/commitdiff
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
authorBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 Aug 2009 19:06:21 +0000 (12:06 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 Aug 2009 19:06:21 +0000 (12:06 -0700)
Conflicts:

module/zfs/vdev_raidz.c

13 files changed:
1  2 
cmd/zdb/zdb.c
cmd/zfs/zfs_main.c
cmd/zpool/zpool_main.c
cmd/zpool/zpool_vdev.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_util.c
module/zfs/dmu.c
module/zfs/dsl_dataset.c
module/zfs/spa.c
module/zfs/spa_misc.c
module/zfs/vdev_label.c
module/zfs/vdev_raidz.c

diff --cc cmd/zdb/zdb.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 15e0e34f01a99b5c29c51ee5067b6cfd1165e148,b3074173e09ccf27094d7924148bd0bbd2c3f1c5..728a9d41330953a447f0ae61dd961cab1c573d3b
@@@ -789,7 -1651,7 +1651,7 @@@ vdev_raidz_io_done(zio_t *zio
        vdev_t *vd = zio->io_vd;
        vdev_t *cvd;
        raidz_map_t *rm = zio->io_vsd;
-       raidz_col_t *rc = NULL, *rc1;
 -      raidz_col_t *rc;
++      raidz_col_t *rc = NULL;
        int unexpected_errors = 0;
        int parity_errors = 0;
        int parity_untried = 0;