aboutsummaryrefslogtreecommitdiffstats
path: root/uts
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2018-08-02 23:17:10 +0000
committerAlexander Motin <mav@FreeBSD.org>2018-08-02 23:17:10 +0000
commite92e58b7ae6c347826de384a81424e0c96767830 (patch)
tree336ee15be378e2146d9d43b2adf9d907552101fa /uts
parentaee8d62a6f4f9b5d51c066ac0ce556c60cacb435 (diff)
downloadsrc-e92e58b7ae6c347826de384a81424e0c96767830.tar.gz
src-e92e58b7ae6c347826de384a81424e0c96767830.zip
9454 ::zfs_blkstats should count embedded blocks
illumos/illumos-gate@dec267e7ea9828898b1c64462daa6636c4ef5e29 Reviewed by: Dan Kimmel <dan.kimmel@delphix.com> Reviewed by: George Wilson <george.wilson@delphix.com> Approved by: Robert Mustacchi <rm@joyent.com> Author: Matthew Ahrens <mahrens@delphix.com>
Notes
Notes: svn path=/vendor-sys/illumos/dist/; revision=337195
Diffstat (limited to 'uts')
-rw-r--r--uts/common/fs/zfs/dsl_scan.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/uts/common/fs/zfs/dsl_scan.c b/uts/common/fs/zfs/dsl_scan.c
index cf93849a627c..6fd97d9bfcd6 100644
--- a/uts/common/fs/zfs/dsl_scan.c
+++ b/uts/common/fs/zfs/dsl_scan.c
@@ -1951,14 +1951,14 @@ dsl_scan_scrub_cb(dsl_pool_t *dp,
int zio_flags = ZIO_FLAG_SCAN_THREAD | ZIO_FLAG_RAW | ZIO_FLAG_CANFAIL;
int scan_delay = 0;
+ count_block(dp->dp_blkstats, bp);
+
if (phys_birth <= scn->scn_phys.scn_min_txg ||
phys_birth >= scn->scn_phys.scn_max_txg)
return (0);
- count_block(dp->dp_blkstats, bp);
-
- if (BP_IS_EMBEDDED(bp))
- return (0);
+ /* Embedded BP's have phys_birth==0, so we reject them above. */
+ ASSERT(!BP_IS_EMBEDDED(bp));
ASSERT(DSL_SCAN_IS_SCRUB_RESILVER(scn));
if (scn->scn_phys.scn_func == POOL_SCAN_SCRUB) {