svn commit: r242862 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

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 at helenius.fi>,
  		mm
  Obtained from:	Brian Behlendorf <behlendorf1 at llnl.gov>,
  		Illumos Bug #3170
  Tested by:	Petri Helenius <petri at 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,