diff options
author | delphij <delphij@FreeBSD.org> | 2013-06-12 07:07:06 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2013-06-12 07:07:06 +0000 |
commit | ab3dbcb998b288fc8190c5c1f56d91720e535286 (patch) | |
tree | 82a807ab86be2fa57fe72fbd606665c2c02dd664 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c | |
parent | cba1418efedac7ba586dbc2591b16cb3cb7e9c66 (diff) | |
download | FreeBSD-src-ab3dbcb998b288fc8190c5c1f56d91720e535286.zip FreeBSD-src-ab3dbcb998b288fc8190c5c1f56d91720e535286.tar.gz |
MFV r251644:
Poor ZFS send / receive performance due to snapshot
hold / release processing (by smh@)
Illumos ZFS issues:
3740 Poor ZFS send / receive performance due to snapshot
hold / release processing
MFC after: 2 weeks
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 | 5 |
1 files changed, 5 insertions, 0 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 efa5540..e74b53f 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 @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2013 Steven Hartland. All rights reserved. */ #include <sys/zfs_context.h> @@ -127,6 +128,10 @@ dsl_destroy_snapshot_check(void *arg, dmu_tx_t *tx) pair = nvlist_next_nvpair(dsda->dsda_errlist, NULL); if (pair != NULL) return (fnvpair_value_int32(pair)); + + if (nvlist_empty(dsda->dsda_successful_snaps)) + return (SET_ERROR(ENOENT)); + return (0); } |