aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndriy Gapon <avg@FreeBSD.org>2019-11-21 14:04:06 +0000
committerAndriy Gapon <avg@FreeBSD.org>2019-11-21 14:04:06 +0000
commit253adf1e4e4778f0eb999353bf8df1d5550b5ee5 (patch)
tree28a262ff691efdca638bc03a71f0824a6b0648a1
parent5bba77446a9a9ac2414b9b709826721d377c0cb5 (diff)
downloadsrc-253adf1e4e4778f0eb999353bf8df1d5550b5ee5.tar.gz
src-253adf1e4e4778f0eb999353bf8df1d5550b5ee5.zip
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>
Notes
Notes: svn path=/vendor-sys/illumos/dist/; revision=354958
-rw-r--r--uts/common/fs/zfs/dsl_scan.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/uts/common/fs/zfs/dsl_scan.c b/uts/common/fs/zfs/dsl_scan.c
index ca82195178d7..78c8c2a5818e 100644
--- a/uts/common/fs/zfs/dsl_scan.c
+++ b/uts/common/fs/zfs/dsl_scan.c
@@ -3432,6 +3432,13 @@ count_block(dsl_scan_t *scn, zfs_all_blkstats_t *zab, const blkptr_t *bp)
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