diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-06-21 21:25:48 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-06-21 21:26:08 +0000 |
| commit | bda7907f05ce783bce74fe1f277b4fbdcb1a36b6 (patch) | |
| tree | 2ab04d1bede1c78b15c2013b9c6a2e410ec321de /usr/src/uts | |
| parent | 62912b5bbe4f051a962b054f5cc52b75e4e4e8f3 (diff) | |
| parent | bb6e70758d0c30c09f148026d6e686e21cfc8d18 (diff) | |
| download | illumos-joyent-bda7907f05ce783bce74fe1f277b4fbdcb1a36b6.tar.gz | |
[illumos-gate merge]
commit bb6e70758d0c30c09f148026d6e686e21cfc8d18
3829 fix for 3740 changed behavior of zfs destroy/hold/release ioctl
Conflicts: usr/src/lib/libzfs/common/libzfs_dataset.c
Diffstat (limited to 'usr/src/uts')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/dsl_destroy.c | 3 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/zfs/dsl_userhold.c | 8 |
2 files changed, 0 insertions, 11 deletions
diff --git a/usr/src/uts/common/fs/zfs/dsl_destroy.c b/usr/src/uts/common/fs/zfs/dsl_destroy.c index e74b53f1aa..f968215db0 100644 --- a/usr/src/uts/common/fs/zfs/dsl_destroy.c +++ b/usr/src/uts/common/fs/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/usr/src/uts/common/fs/zfs/dsl_userhold.c b/usr/src/uts/common/fs/zfs/dsl_userhold.c index b6fa417eec..a948e10b12 100644 --- a/usr/src/uts/common/fs/zfs/dsl_userhold.c +++ b/usr/src/uts/common/fs/zfs/dsl_userhold.c @@ -126,10 +126,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); } @@ -468,10 +464,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); } |