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

This commit is contained in:
Brian Behlendorf 2010-06-28 10:36:12 -07:00
commit af239500df
1 changed files with 4 additions and 1 deletions

View File

@ -1638,8 +1638,11 @@ raidz_checksum_verify(zio_t *zio)
{ {
zio_bad_cksum_t zbc; zio_bad_cksum_t zbc;
raidz_map_t *rm = zio->io_vsd; raidz_map_t *rm = zio->io_vsd;
int ret;
int ret = zio_checksum_error(zio, &zbc); bzero(&zbc, sizeof (zio_bad_cksum_t));
ret = zio_checksum_error(zio, &zbc);
if (ret != 0 && zbc.zbc_injected != 0) if (ret != 0 && zbc.zbc_injected != 0)
rm->rm_ecksuminjected = 1; rm->rm_ecksuminjected = 1;