D19650.id55251.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D19650.id55251.diff
View Options

	Index: lib/libbe/be.c
	===================================================================
	--- lib/libbe/be.c
	+++ lib/libbe/be.c
	@@ -265,6 +265,16 @@
	zfs_prop_get(fs, ZFS_PROP_ORIGIN, origin, sizeof(origin),
	NULL, NULL, 0, 1) != 0)
	return (set_error(lbh, BE_ERR_NOORIGIN));
	+
	+ /* Don't destroy a mounted dataset unless force is specified */
	+ if ((mounted = zfs_is_mounted(fs, NULL)) != 0) {
	+ if (force) {
	+ zfs_unmount(fs, NULL, 0);
	+ } else {
	+ free(bdd.snapname);
	+ return (set_error(lbh, BE_ERR_DESTROYMNT));
	+ }
	+ }
	} else {
	if (!zfs_dataset_exists(lbh->lzh, path, ZFS_TYPE_SNAPSHOT))
	return (set_error(lbh, BE_ERR_NOENT));
	@@ -280,16 +290,6 @@
	}
	}

	- /* Check if mounted, unmount if force is specified */
	- if ((mounted = zfs_is_mounted(fs, NULL)) != 0) {
	- if (force) {
	- zfs_unmount(fs, NULL, 0);
	- } else {
	- free(bdd.snapname);
	- return (set_error(lbh, BE_ERR_DESTROYMNT));
	- }
	- }
	-
	err = be_destroy_cb(fs, &bdd);
	zfs_close(fs);
	free(bdd.snapname);