diff options
| author | delphij <delphij@FreeBSD.org> | 2015-01-23 17:31:41 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2015-01-23 17:31:41 +0000 |
| commit | 85cd2fc0bffd879f86484aff7d41262b124a2201 (patch) | |
| tree | f9eb0736ad6eea2a8e85427b0332f2aa2597311f /sys/cddl/contrib | |
| parent | 4cf14a4e5ede29920176d66fad52c637ed59174c (diff) | |
| download | FreeBSD-src-85cd2fc0bffd879f86484aff7d41262b124a2201.zip FreeBSD-src-85cd2fc0bffd879f86484aff7d41262b124a2201.tar.gz | |
MFC r275737: MFV r275545:
If zio_checksum_error() returns other than ECKSUM (e.g. EINVAL), it does not
fill in the "zio_bad_cksum_t *info" parameter. Caller should not attempt to
use it in this case.
Illumos issue:
5348 zio_checksum_error() only fills in info if ECKSUM
Diffstat (limited to 'sys/cddl/contrib')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c index 6d6ede5..9a5c4eb 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c @@ -2950,7 +2950,8 @@ zio_checksum_verify(zio_t *zio) if ((error = zio_checksum_error(zio, &info)) != 0) { zio->io_error = error; - if (!(zio->io_flags & ZIO_FLAG_SPECULATIVE)) { + if (error == ECKSUM && + !(zio->io_flags & ZIO_FLAG_SPECULATIVE)) { zfs_ereport_start_checksum(zio->io_spa, zio->io_vd, zio, zio->io_offset, zio->io_size, NULL, &info); |
