socsvn commit: r329235 - soc2017/kneitinger/libbe-head/lib/libbe

allanjude at FreeBSD.org allanjude at FreeBSD.org
Thu Nov 9 15:48:36 UTC 2017


Author: allanjude
Date: Thu Nov  9 15:48:35 2017
New Revision: 329235
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=329235

Log:
  Make sure what is being destroyed is a filesystem, not a volume or other type of dataset

Modified:
  soc2017/kneitinger/libbe-head/lib/libbe/be.c

Modified: soc2017/kneitinger/libbe-head/lib/libbe/be.c
==============================================================================
--- soc2017/kneitinger/libbe-head/lib/libbe/be.c	Thu Nov  9 15:43:38 2017	(r329234)
+++ soc2017/kneitinger/libbe-head/lib/libbe/be.c	Thu Nov  9 15:48:35 2017	(r329235)
@@ -144,7 +144,7 @@
 	printf("path: %s\n", path);
 
 	if (strchr(name, '@') == NULL) {
-		if (!zfs_dataset_exists(lbh->lzh, path, ZFS_TYPE_DATASET)) {
+		if (!zfs_dataset_exists(lbh->lzh, path, ZFS_TYPE_FILESYSTEM)) {
 			return (set_error(lbh, BE_ERR_NOENT));
 		}
 
@@ -152,7 +152,7 @@
 			return (set_error(lbh, BE_ERR_DESTROYACT));
 		}
 
-		fs = zfs_open(lbh->lzh, p, ZFS_TYPE_DATASET);
+		fs = zfs_open(lbh->lzh, p, ZFS_TYPE_FILESYSTEM);
 	} else {
 
 		if (!zfs_dataset_exists(lbh->lzh, path, ZFS_TYPE_SNAPSHOT)) {


More information about the svn-soc-all mailing list