diff options
| author | delphij <delphij@FreeBSD.org> | 2013-06-25 22:14:32 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2013-06-25 22:14:32 +0000 |
| commit | 4dfc3c75a2687795bcf32661c8434cf7628e82a2 (patch) | |
| tree | 4b1454baea37713509a3ede6d1c64c528e9a810f /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c | |
| parent | 524046622706f82ee0244247e5a37dc1c966856f (diff) | |
| download | FreeBSD-src-4dfc3c75a2687795bcf32661c8434cf7628e82a2.zip FreeBSD-src-4dfc3c75a2687795bcf32661c8434cf7628e82a2.tar.gz | |
MFV r252215:
Restore a previous behavior before r251646, where when destructing
ZFS snapshot, the ioctl would return ENOENT when it hit any of
them in the errlist (the new behavior was only return ENOENT when
all returns error).
Illumos ZFS issues:
3829 fix for 3740 changed behavior of zfs destroy/hold/release ioctl
MFC after: 1 week
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c index e74b53f..f968215 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c +++ b/sys/cddl/contrib/opensolaris/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); } |
