From owner-svn-src-head@freebsd.org  Mon Oct  2 11:07:49 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 ADFD1E3C7B1;
 Mon,  2 Oct 2017 11:07:49 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (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 7CD4C63517;
 Mon,  2 Oct 2017 11:07:49 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v92B7mAo092553;
 Mon, 2 Oct 2017 11:07:48 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v92B7mNS092552;
 Mon, 2 Oct 2017 11:07:48 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201710021107.v92B7mNS092552@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Mon, 2 Oct 2017 11:07:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324194 -
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: head
X-SVN-Commit-Author: avg
X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Commit-Revision: 324194
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Oct 2017 11:07:49 -0000

Author: avg
Date: Mon Oct  2 11:07:48 2017
New Revision: 324194
URL: https://svnweb.freebsd.org/changeset/base/324194

Log:
  fix incorrect use of getzfsvfs_impl in r324163, ZFS Channel Programs
  
  getzfsvfs_impl() returns a referenced, not busied, filesystem,
  so the matching call is vfs_rel, not vfs_unbusy.
  
  MFC after:	4 weeks
  X-MFC with:	r324163

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_get.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_get.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_get.c	Mon Oct  2 09:45:17 2017	(r324193)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_get.c	Mon Oct  2 11:07:48 2017	(r324194)
@@ -288,7 +288,7 @@ get_temporary_prop(dsl_dataset_t *ds, zfs_prop_t zfs_p
 #ifdef illumos
 		VFS_RELE(vfsp);
 #else
-		vfs_unbusy(vfsp);
+		vfs_rel(vfsp);
 #endif
 		return (ENOENT);
 	}
@@ -296,7 +296,7 @@ get_temporary_prop(dsl_dataset_t *ds, zfs_prop_t zfs_p
 #ifdef illumos
 	VFS_RELE(vfsp);
 #else
-	vfs_unbusy(vfsp);
+	vfs_rel(vfsp);
 #endif
 	if (tmp != *val) {
 		(void) strcpy(setpoint, "temporary");