svn commit: r275737 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Xin LI
delphij at FreeBSD.org
Sat Dec 13 01:26:08 UTC 2014
Author: delphij
Date: Sat Dec 13 01:26:06 2014
New Revision: 275737
URL: https://svnweb.freebsd.org/changeset/base/275737
Log:
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
MFC after: 2 weeks
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
Directory Properties:
head/sys/cddl/contrib/opensolaris/ (props changed)
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Sat Dec 13 01:18:23 2014 (r275736)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Sat Dec 13 01:26:06 2014 (r275737)
@@ -2958,7 +2958,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);
More information about the svn-src-head
mailing list