diff options
| author | Matthew Ahrens <mahrens@delphix.com> | 2014-07-08 20:49:56 -0800 |
|---|---|---|
| committer | Christopher Siden <chris@delphix.com> | 2014-07-08 21:49:57 -0700 |
| commit | 7d46dc6ca63a6f3f0d51aa655bfcf10cf2405a9e (patch) | |
| tree | ba560108487312f24294332156f10015c91b775d /usr/src/uts/common/fs/zfs/spa.c | |
| parent | cd67d23d32df7b247d00e5b82257a2220b1e0c13 (diff) | |
| download | illumos-joyent-7d46dc6ca63a6f3f0d51aa655bfcf10cf2405a9e.tar.gz | |
4951 ZFS administrative commands should use reserved space, not fail with ENOSPC
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Garrett D'Amore <garrett@damore.org>
Diffstat (limited to 'usr/src/uts/common/fs/zfs/spa.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/spa.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/uts/common/fs/zfs/spa.c b/usr/src/uts/common/fs/zfs/spa.c index c8cabb2c32..1f86482725 100644 --- a/usr/src/uts/common/fs/zfs/spa.c +++ b/usr/src/uts/common/fs/zfs/spa.c @@ -673,7 +673,8 @@ spa_prop_set(spa_t *spa, nvlist_t *nvp) * feature descriptions object. */ error = dsl_sync_task(spa->spa_name, NULL, - spa_sync_version, &ver, 6); + spa_sync_version, &ver, + 6, ZFS_SPACE_CHECK_RESERVED); if (error) return (error); continue; @@ -685,7 +686,7 @@ spa_prop_set(spa_t *spa, nvlist_t *nvp) if (need_sync) { return (dsl_sync_task(spa->spa_name, NULL, spa_sync_props, - nvp, 6)); + nvp, 6, ZFS_SPACE_CHECK_RESERVED)); } return (0); @@ -766,7 +767,7 @@ spa_change_guid(spa_t *spa) guid = spa_generate_guid(NULL); error = dsl_sync_task(spa->spa_name, spa_change_guid_check, - spa_change_guid_sync, &guid, 5); + spa_change_guid_sync, &guid, 5, ZFS_SPACE_CHECK_RESERVED); if (error == 0) { spa_config_sync(spa, B_FALSE, B_TRUE); |