diff options
| author | Matthew Ahrens <[email protected]> | 2013-06-20 14:43:17 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-11-04 11:18:14 -0800 |
| commit | 1a077756e8ba946a55f999fa1cb5f0e7dcb9aa81 (patch) | |
| tree | 40c84c287964ba8d9f517d3392c7a482c85109cf /module/zfs | |
| parent | 34ffbed88c949bc4c8b52691e548db16a6e6816a (diff) | |
Illumos #3829
3829 fix for 3740 changed behavior of zfs destroy/hold/release ioctl
Reviewed by: Matt Amdur <[email protected]>
Reviewed by: Christopher Siden <[email protected]>
Approved by: Richard Lowe <[email protected]>
References:
https://www.illumos.org/issues/3829
illumos/illumos-gate@bb6e70758d0c30c09f148026d6e686e21cfc8d18
Ported-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #1775
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/dsl_destroy.c | 3 | ||||
| -rw-r--r-- | module/zfs/dsl_userhold.c | 8 |
2 files changed, 0 insertions, 11 deletions
diff --git a/module/zfs/dsl_destroy.c b/module/zfs/dsl_destroy.c index b1fd270da..1c4c3deec 100644 --- a/module/zfs/dsl_destroy.c +++ b/module/zfs/dsl_destroy.c @@ -129,9 +129,6 @@ dsl_destroy_snapshot_check(void *arg, dmu_tx_t *tx) if (pair != NULL) return (fnvpair_value_int32(pair)); - if (nvlist_empty(dsda->dsda_successful_snaps)) - return (SET_ERROR(ENOENT)); - return (0); } diff --git a/module/zfs/dsl_userhold.c b/module/zfs/dsl_userhold.c index f33292787..db9540d13 100644 --- a/module/zfs/dsl_userhold.c +++ b/module/zfs/dsl_userhold.c @@ -127,10 +127,6 @@ dsl_dataset_user_hold_check(void *arg, dmu_tx_t *tx) } } - /* Return ENOENT if no holds would be created. */ - if (nvlist_empty(dduha->dduha_chkholds)) - return (SET_ERROR(ENOENT)); - return (0); } @@ -472,10 +468,6 @@ dsl_dataset_user_release_check(void *arg, dmu_tx_t *tx) } } - /* Return ENOENT if none of the holds existed. */ - if (nvlist_empty(ddura->ddura_chkholds)) - return (SET_ERROR(ENOENT)); - return (0); } |