diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-07-18 08:24:59 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-07-18 08:24:59 +0000 |
| commit | 4f8f62335ad901cd53d6d7984e96804f361563be (patch) | |
| tree | 4c5709ce45982c8e9e746213529dfe203beb7bf9 /uts/common/fs/zfs/bpobj.c | |
| parent | 1aa03d3a8432d812a4400b9b99cf10959bc5c43c (diff) | |
| parent | af56e8c4b416d774961b41eee1eb349d657ebb8c (diff) | |
Notes
Diffstat (limited to 'uts/common/fs/zfs/bpobj.c')
| -rw-r--r-- | uts/common/fs/zfs/bpobj.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/uts/common/fs/zfs/bpobj.c b/uts/common/fs/zfs/bpobj.c index 022921c666b8..72be31235607 100644 --- a/uts/common/fs/zfs/bpobj.c +++ b/uts/common/fs/zfs/bpobj.c @@ -20,13 +20,11 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011 by Delphix. All rights reserved. */ #include <sys/bpobj.h> #include <sys/zfs_context.h> #include <sys/refcount.h> -#include <sys/dsl_pool.h> uint64_t bpobj_alloc(objset_t *os, int blocksize, dmu_tx_t *tx) @@ -442,10 +440,7 @@ space_range_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx) struct space_range_arg *sra = arg; if (bp->blk_birth > sra->mintxg && bp->blk_birth <= sra->maxtxg) { - if (dsl_pool_sync_context(spa_get_dsl(sra->spa))) - sra->used += bp_get_dsize_sync(sra->spa, bp); - else - sra->used += bp_get_dsize(sra->spa, bp); + sra->used += bp_get_dsize_sync(sra->spa, bp); sra->comp += BP_GET_PSIZE(bp); sra->uncomp += BP_GET_UCSIZE(bp); } |