diff options
| author | avg <avg@FreeBSD.org> | 2012-11-10 12:22:26 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2012-11-10 12:22:26 +0000 |
| commit | 04f237d3bf5308b67b36c8823b2baa4fca1d9be9 (patch) | |
| tree | 58d62b380bd943a4a94a207c8d637a084c640727 /sys/cddl | |
| parent | 7e7f6eb1dfb834d8da899502e7f5ad456b45f8f6 (diff) | |
| download | FreeBSD-src-04f237d3bf5308b67b36c8823b2baa4fca1d9be9.zip FreeBSD-src-04f237d3bf5308b67b36c8823b2baa4fca1d9be9.tar.gz | |
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
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
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 1b4cb78..f110d8c 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, |
