Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Jan 2015 17:31:42 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r277575 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Message-ID:  <201501231731.t0NHVgIF095049@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Fri Jan 23 17:31:41 2015
New Revision: 277575
URL: https://svnweb.freebsd.org/changeset/base/277575

Log:
  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

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Fri Jan 23 17:24:56 2015	(r277574)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Fri Jan 23 17:31:41 2015	(r277575)
@@ -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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501231731.t0NHVgIF095049>