diff options
author | Matthew Ahrens <[email protected]> | 2014-11-03 12:28:43 -0800 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2015-05-04 09:41:10 -0700 |
commit | 3d45fdd6c0d5b4c8e42b6a2cda00bf6f22c9f2bf (patch) | |
tree | 79fabc013cdea334851b2b7ae9d59118e601f8eb /cmd/zhack/zhack.c | |
parent | cfec5b17b3b04f07381cc705eaf733794d034065 (diff) |
Illumos 4951 - ZFS administrative commands should use reserved space
4951 ZFS administrative commands should use reserved space, not with ENOSPC
Reviewed by: John Kennedy <[email protected]>
Reviewed by: George Wilson <[email protected]>
Reviewed by: Christopher Siden <[email protected]>
Reviewed by: Dan McDonald <[email protected]>
Approved by: Garrett D'Amore <[email protected]>
References:
https://www.illumos.org/issues/4373
https://github.com/illumos/illumos-gate/commit/7d46dc6
Ported by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'cmd/zhack/zhack.c')
-rw-r--r-- | cmd/zhack/zhack.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd/zhack/zhack.c b/cmd/zhack/zhack.c index 19493bd09..3f86714fe 100644 --- a/cmd/zhack/zhack.c +++ b/cmd/zhack/zhack.c @@ -20,7 +20,7 @@ */ /* - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. */ @@ -362,7 +362,7 @@ zhack_do_feature_enable(int argc, char **argv) feature.fi_guid); VERIFY0(dsl_sync_task(spa_name(spa), NULL, - zhack_feature_enable_sync, &feature, 5)); + zhack_feature_enable_sync, &feature, 5, ZFS_SPACE_CHECK_NORMAL)); spa_close(spa, FTAG); @@ -473,7 +473,8 @@ zhack_do_feature_ref(int argc, char **argv) } VERIFY0(dsl_sync_task(spa_name(spa), NULL, - decr ? feature_decr_sync : feature_incr_sync, &feature, 5)); + decr ? feature_decr_sync : feature_incr_sync, &feature, + 5, ZFS_SPACE_CHECK_NORMAL)); spa_close(spa, FTAG); } |