c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-27 03:19:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Illumos 4951 - ZFS administrative commands (fix)

Browse Source 
4951 ZFS administrative commands should use reserved space, not fail with ENOSPC
Approved by: Christopher Siden <christopher.siden@delphix.com>

References:
  https://www.illumos.org/issues/4951
  https://github.com/illumos/illumos-gate/commit/c39f2c8

Ported by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Christopher Siden 2014-11-04 09:35:37 -08:00 committed by Brian Behlendorf
parent 3d45fdd6c0
commit 0c60cc326b
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sys/spa.h
View File

@ -786,6 +786,7 @@ extern spa_load_state_t spa_load_state(spa_t *spa);
extern uint64_t spa_freeze_txg(spa_t *spa); extern uint64_t spa_freeze_txg(spa_t *spa);
extern uint64_t spa_get_asize(spa_t *spa, uint64_t lsize); extern uint64_t spa_get_asize(spa_t *spa, uint64_t lsize);
extern uint64_t spa_get_dspace(spa_t *spa); extern uint64_t spa_get_dspace(spa_t *spa);
extern uint64_t spa_get_slop_space(spa_t *spa);
extern void spa_update_dspace(spa_t *spa); extern void spa_update_dspace(spa_t *spa);
extern uint64_t spa_version(spa_t *spa); extern uint64_t spa_version(spa_t *spa);
extern boolean_t spa_deflate(spa_t *spa); extern boolean_t spa_deflate(spa_t *spa);

7
module/zfs/dsl_pool.c
View File

@ -612,17 +612,12 @@ dsl_pool_adjustedsize(dsl_pool_t *dp, boolean_t netfree)
uint64_t space, resv; 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, * If we're trying to assess whether it's OK to do a free,
* cut the reservation in half to allow forward progress * cut the reservation in half to allow forward progress
* (e.g. make it possible to rm(1) files from a full pool). * (e.g. make it possible to rm(1) files from a full pool).
*/ */
space = spa_get_dspace(dp->dp_spa); space = spa_get_dspace(dp->dp_spa);
resv = MAX(space >> 6, SPA_MINDEVSIZE >> 1); resv = spa_get_slop_space(dp->dp_spa);
if (netfree) if (netfree)
resv >>= 1; resv >>= 1;