From owner-svn-src-all@FreeBSD.ORG  Fri Oct 17 13:46:16 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C9345DEC;
 Fri, 17 Oct 2014 13:46:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B4B6B9C3;
 Fri, 17 Oct 2014 13:46:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9HDkGN2057366;
 Fri, 17 Oct 2014 13:46:16 GMT (envelope-from smh@FreeBSD.org)
Received: (from smh@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9HDkGQq057365;
 Fri, 17 Oct 2014 13:46:16 GMT (envelope-from smh@FreeBSD.org)
Message-Id: <201410171346.s9HDkGQq057365@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: smh set sender to smh@FreeBSD.org
 using -f
From: Steven Hartland <smh@FreeBSD.org>
Date: Fri, 17 Oct 2014 13:46:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r273217 -
 releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Oct 2014 13:46:16 -0000

Author: smh
Date: Fri Oct 17 13:46:16 2014
New Revision: 273217
URL: https://svnweb.freebsd.org/changeset/base/273217

Log:
  MFS10 r273057
  MFC r272324
  Fix a missed merge introduced in r272883
  
  Approved by:	re@ (gjb)
  Sponsored by:	Multiplay

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

Modified: releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Fri Oct 17 13:40:17 2014	(r273216)
+++ releng/10.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Fri Oct 17 13:46:16 2014	(r273217)
@@ -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);