From owner-svn-src-all@FreeBSD.ORG  Sat Nov 10 12:22:26 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9BB5B3CF;
 Sat, 10 Nov 2012 12:22:26 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7985B8FC13;
 Sat, 10 Nov 2012 12:22:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAACMQGS006194;
 Sat, 10 Nov 2012 12:22:26 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAACMQ1Y006193;
 Sat, 10 Nov 2012 12:22:26 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201211101222.qAACMQ1Y006193@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 10 Nov 2012 12:22:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242862 -
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: head
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.14
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: Sat, 10 Nov 2012 12:22:26 -0000

Author: avg
Date: Sat Nov 10 12:22:26 2012
New Revision: 242862
URL: http://svnweb.freebsd.org/changeset/base/242862

Log:
  zfs_ioc_destroy_snaps_nvl: remove disk device entries for zvol snapshots
  
  ... before trying to destroy the zvol snapshots themselves.
  
  PR:		kern/173442
  Reported by:	Petri Helenius <petri@helenius.fi>,
  		mm
  Obtained from:	Brian Behlendorf <behlendorf1@llnl.gov>,
  		Illumos Bug #3170
  Tested by:	Petri Helenius <petri@helenius.fi>
  MFC after:	10 days

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Sat Nov 10 12:08:18 2012	(r242861)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Sat Nov 10 12:22:26 2012	(r242862)
@@ -3245,6 +3245,7 @@ zfs_ioc_destroy_snaps_nvl(zfs_cmd_t *zc)
 		}
 
 		(void) zfs_unmount_snap(name, NULL);
+		(void) zvol_remove_minor(name);
 	}
 
 	err = dmu_snapshots_destroy_nvl(nvl, zc->zc_defer_destroy,