diff options
| author | Steven Hartland <smh@freebsd.org> | 2013-06-11 22:01:53 -0800 |
|---|---|---|
| committer | Christopher Siden <chris.siden@delphix.com> | 2013-06-11 23:01:53 -0700 |
| commit | a7a845e4bf22fd1b2a284729ccd95c7370a0438c (patch) | |
| tree | 761a7618b306660db2217226a0c2e5e6485f9786 /usr/src/uts/common/fs/zfs/zfs_ioctl.c | |
| parent | 3cb69f734bc60bbb4d56a28c83706db862bec082 (diff) | |
| download | illumos-gate-a7a845e4bf22fd1b2a284729ccd95c7370a0438c.tar.gz | |
3740 Poor ZFS send / receive performance due to snapshot hold / release processing
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Christopher Siden <christopher.siden@delphix.com>
Diffstat (limited to 'usr/src/uts/common/fs/zfs/zfs_ioctl.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_ioctl.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_ioctl.c b/usr/src/uts/common/fs/zfs/zfs_ioctl.c index e2abe5f942..46ea78970d 100644 --- a/usr/src/uts/common/fs/zfs/zfs_ioctl.c +++ b/usr/src/uts/common/fs/zfs/zfs_ioctl.c @@ -26,6 +26,7 @@ * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. + * Copyright (c) 2013 Steven Hartland. All rights reserved. */ /* @@ -4984,20 +4985,6 @@ zfs_ioc_get_holds(const char *snapname, nvlist_t *args, nvlist_t *outnvl) static int zfs_ioc_release(const char *pool, nvlist_t *holds, nvlist_t *errlist) { - nvpair_t *pair; - int err; - - /* - * The release may cause the snapshot to be destroyed; make sure it - * is not mounted. - */ - for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL; - pair = nvlist_next_nvpair(holds, pair)) { - err = zfs_unmount_snap(nvpair_name(pair)); - if (err != 0) - return (err); - } - return (dsl_dataset_user_release(holds, errlist)); } |