From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 18 Aug 2009 19:06:21 +0000 (-0700)
Subject: Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
X-Git-Tag: zfs-0.4.6~42^2^2^2^2^2^2~2^2^2~6^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5b5d32d69a35d641dedeacf23e54db5421bc74c;p=zfs

Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit

Conflicts:

	module/zfs/vdev_raidz.c
---

c5b5d32d69a35d641dedeacf23e54db5421bc74c
diff --cc module/zfs/vdev_raidz.c
index 15e0e34f0,b3074173e..728a9d413
--- a/module/zfs/vdev_raidz.c
+++ b/module/zfs/vdev_raidz.c
@@@ -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;