From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Wed, 16 Jun 2010 19:11:18 +0000 (-0700)
Subject: Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~26^2^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=877a37d8bd809c0de9ebe66782f48b2baa3f5355;p=zfs

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

877a37d8bd809c0de9ebe66782f48b2baa3f5355
diff --cc module/zfs/vdev_label.c
index e46120a36,f7956799e..124caa377
--- a/module/zfs/vdev_label.c
+++ b/module/zfs/vdev_label.c
@@@ -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);