From 7631b580ffd1d25aa35d5faaec750f537cd97ca6 Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Sat, 10 Nov 2012 12:22:26 +0000 Subject: [PATCH] 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 , mm Obtained from: Brian Behlendorf , Illumos Bug #3170 Tested by: Petri Helenius MFC after: 10 days --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 1 + 1 file changed, 1 insertion(+) 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 1b4cb782da69..f110d8c9d8cd 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 @@ -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,