From owner-svn-soc-all@freebsd.org  Thu Nov  9 15:48:36 2017
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 490E4E53DFE
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Thu,  9 Nov 2017 15:48:36 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3BB3D6B9AC
 for <svn-soc-all@FreeBSD.org>; Thu,  9 Nov 2017 15:48:36 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id vA9FmaFm093428
 for <svn-soc-all@FreeBSD.org>; Thu, 9 Nov 2017 15:48:36 GMT
 (envelope-from allanjude@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id vA9FmZP7093412
 for svn-soc-all@FreeBSD.org; Thu, 9 Nov 2017 15:48:35 GMT
 (envelope-from allanjude@FreeBSD.org)
Date: Thu, 9 Nov 2017 15:48:35 GMT
Message-Id: <201711091548.vA9FmZP7093412@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 allanjude@FreeBSD.org using -f
From: allanjude@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r329235 - soc2017/kneitinger/libbe-head/lib/libbe
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Nov 2017 15:48:36 -0000

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)) {