Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Nov 2019 14:04:06 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org
Subject:   svn commit: r354958 - vendor-sys/illumos/dist/uts/common/fs/zfs
Message-ID:  <201911211404.xALE469R047379@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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@ee2f9ca4ea24f72b05598c92aad7f42fb77b1345
  https://github.com/illumos/illumos-gate/commit/ee2f9ca4ea24f72b05598c92aad7f42fb77b1345
  
  https://www.illumos.org/issues/11051
  
  Author: Bill Sommerfeld <sommerfeld@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



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