svn commit: r354958 - vendor-sys/illumos/dist/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Thu Nov 21 14:04:06 2019
New Revision: 354958
URL: https://svnweb.freebsd.org/changeset/base/354958

Log:
  11051 zfs miscounts BP_IS_EMBEDDED blocks during scan.
  
  illumos/illumos-gate at ee2f9ca4ea24f72b05598c92aad7f42fb77b1345
  https://github.com/illumos/illumos-gate/commit/ee2f9ca4ea24f72b05598c92aad7f42fb77b1345
  
  https://www.illumos.org/issues/11051
  
  Author: Bill Sommerfeld <sommerfeld at alum.mit.edu>

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_scan.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_scan.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_scan.c	Thu Nov 21 14:02:54 2019	(r354957)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_scan.c	Thu Nov 21 14:04:06 2019	(r354958)
@@ -3432,6 +3432,13 @@ count_block(dsl_scan_t *scn, zfs_all_blkstats_t *zab, 
 	int i;
 
 	/*
+	 * Don't count embedded bp's, since we already did the work of
+	 * scanning these when we scanned the containing block.
+	 */
+	if (BP_IS_EMBEDDED(bp))
+		return;
+
+	/*
 	 * Update the spa's stats on how many bytes we have issued.
 	 * Sequential scrubs create a zio for each DVA of the bp. Each
 	 * of these will include all DVAs for repair purposes, but the