From 02d8987f8ddd0618a75029e5a4d8e2167dab4951 Mon Sep 17 00:00:00 2001 From: delphij Date: Mon, 13 Oct 2014 18:46:30 +0000 Subject: Fix a missed merge introduced in r272883. --- 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 8c2e9b9..8c2d11c 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); -- cgit v1.1