Author: mav
Date: Wed Jul 26 16:19:04 2017
New Revision: 321533
URL: https://svnweb.freebsd.org/changeset/base/321533

Log:
  MFC r317238: MFV 316871
  
  7490 real checksum errors are silenced when zinject is on
  
  illumos/illumos-gate@6cedfc397d92d64e442f0aae4445ac507beaf58f
  
https://github.com/illumos/illumos-gate/commit/6cedfc397d92d64e442f0aae4445ac507beaf58f
  
  https://www.illumos.org/issues/7490
    When zinject is on, error codes from zfs_checksum_error() can be overwritten
    due to an incorrect and overly-complex if condition.
  
  Reviewed by: George Wilson <george.wil...@delphix.com>
  Reviewed by: Paul Dagnelie <p...@delphix.com>
  Reviewed by: Dan Kimmel <dan.kim...@delphix.com>
  Reviewed by: Matthew Ahrens <mahr...@delphix.com>
  Approved by: Robert Mustacchi <r...@joyent.com>
  Author: Pavel Zakharov <pavel.zakha...@delphix.com>

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

Modified: 
stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c     
Wed Jul 26 16:18:19 2017        (r321532)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c     
Wed Jul 26 16:19:04 2017        (r321533)
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013, 2015 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2016 by Delphix. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  * Copyright 2013 Saso Kiselkov. All rights reserved.
  */
@@ -392,12 +392,13 @@ zio_checksum_error(zio_t *zio, zio_bad_cksum_t *info)
 
        error = zio_checksum_error_impl(spa, bp, checksum, data, size,
            offset, info);
-       if (error != 0 && zio_injection_enabled && !zio->io_error &&
-           (error = zio_handle_fault_injection(zio, ECKSUM)) != 0) {
 
-               info->zbc_injected = 1;
-               return (error);
+       if (zio_injection_enabled && error == 0 && zio->io_error == 0) {
+               error = zio_handle_fault_injection(zio, ECKSUM);
+               if (error != 0)
+                       info->zbc_injected = 1;
        }
+
        return (error);
 }
 
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to