svn commit: r273057 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Mon Oct 13 18:46:30 2014
New Revision: 273057
URL: https://svnweb.freebsd.org/changeset/base/273057

Log:
  Fix a missed merge introduced in r272883.

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Mon Oct 13 16:48:01 2014	(r273056)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Mon Oct 13 18:46:30 2014	(r273057)
@@ -3662,7 +3662,6 @@ zfs_ioc_destroy_bookmarks(const char *po
 		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);