From b8a02ab78b3b531141d96ca42839169c9ef5e6a7 Mon Sep 17 00:00:00 2001 From: smh Date: Fri, 17 Oct 2014 13:46:16 +0000 Subject: [PATCH] MFS10 r273057 MFC r272324 Fix a missed merge introduced in r272883 Approved by: re@ (gjb) Sponsored by: Multiplay git-svn-id: svn://svn.freebsd.org/base/releng/10.1@273217 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c index 8c2e9b90d..8c2d11c18 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c @@ -3662,7 +3662,6 @@ zfs_ioc_destroy_bookmarks(const char *poolname, nvlist_t *innvl, if (strncmp(name, poolname, poollen) != 0 || (name[poollen] != '/' && name[poollen] != '#')) return (SET_ERROR(EXDEV)); - (void) zvol_remove_minor(name); } error = dsl_bookmark_destroy(innvl, outnvl); -- 2.42.0