diff options
| author | Matthew Ahrens <mahrens@delphix.com> | 2017-12-04 11:29:40 -0800 |
|---|---|---|
| committer | Prakash Surya <prakash.surya@delphix.com> | 2018-06-01 09:22:51 -0700 |
| commit | dec267e7ea9828898b1c64462daa6636c4ef5e29 (patch) | |
| tree | 73eb31cb25a2db5a0bd1d07f73157fa7d6cc4a49 /usr | |
| parent | fe3ba4d1227d8746116ece7240682b13595c3142 (diff) | |
| download | illumos-joyent-dec267e7ea9828898b1c64462daa6636c4ef5e29.tar.gz | |
9454 ::zfs_blkstats should count embedded blocks
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/dsl_scan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/common/fs/zfs/dsl_scan.c b/usr/src/uts/common/fs/zfs/dsl_scan.c index cf93849a62..6fd97d9bfc 100644 --- a/usr/src/uts/common/fs/zfs/dsl_scan.c +++ b/usr/src/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) { |