diff options
author | delphij <delphij@FreeBSD.org> | 2014-07-23 00:49:35 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2014-07-23 00:49:35 +0000 |
commit | 70f7d126e3856e0f9bee5221f3e8ffcb7e2434ab (patch) | |
tree | 1e189bbe3eded527c641df530a952dcd8f85cc68 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c | |
parent | 776d6cbee6ebec7755f3d97e5b0c1f04966cd646 (diff) | |
download | FreeBSD-src-70f7d126e3856e0f9bee5221f3e8ffcb7e2434ab.zip FreeBSD-src-70f7d126e3856e0f9bee5221f3e8ffcb7e2434ab.tar.gz |
MFC r268473: MFV r268455:
Use reserved space for ZFS administrative commands.
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c')
-rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c index 26a8559..6a248b3 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c @@ -640,17 +640,12 @@ dsl_pool_adjustedsize(dsl_pool_t *dp, boolean_t netfree) uint64_t space, resv; /* - * Reserve about 1.6% (1/64), or at least 32MB, for allocation - * efficiency. - * XXX The intent log is not accounted for, so it must fit - * within this slop. - * * If we're trying to assess whether it's OK to do a free, * cut the reservation in half to allow forward progress * (e.g. make it possible to rm(1) files from a full pool). */ space = spa_get_dspace(dp->dp_spa); - resv = MAX(space >> 6, SPA_MINDEVSIZE >> 1); + resv = spa_get_slop_space(dp->dp_spa); if (netfree) resv >>= 1; |