From owner-svn-src-projects@FreeBSD.ORG  Tue Nov 10 13:35:36 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4CB841065676;
	Tue, 10 Nov 2009 13:35:36 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3BAF88FC1B;
	Tue, 10 Nov 2009 13:35:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAADZYWg060675;
	Tue, 10 Nov 2009 13:35:34 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAADZYj6060673;
	Tue, 10 Nov 2009 13:35:34 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911101335.nAADZYj6060673@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Tue, 10 Nov 2009 13:35:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199138 -
	projects/clangbsd/cddl/contrib/opensolaris/lib/libzfs/common
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Nov 2009 13:35:36 -0000

Author: rdivacky
Date: Tue Nov 10 13:35:34 2009
New Revision: 199138
URL: http://svn.freebsd.org/changeset/base/199138

Log:
  Revert to HEAD state, clang can compile this.

Modified:
  projects/clangbsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c

Modified: projects/clangbsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
==============================================================================
--- projects/clangbsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c	Tue Nov 10 11:50:37 2009	(r199137)
+++ projects/clangbsd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c	Tue Nov 10 13:35:34 2009	(r199138)
@@ -1176,6 +1176,7 @@ dataset_cmp(const void *a, const void *b
  * we have the list of all filesystems, we iterate over them in order and mount
  * and/or share each one.
  */
+#pragma weak zpool_mount_datasets = zpool_enable_datasets
 int
 zpool_enable_datasets(zpool_handle_t *zhp, const char *mntopts, int flags)
 {
@@ -1279,6 +1280,7 @@ mountpoint_compare(const void *a, const 
  * arbitrarily (on I/O error, for example).  Instead, we walk /etc/mnttab and
  * gather all the filesystems that are currently mounted.
  */
+#pragma weak zpool_unmount_datasets = zpool_disable_datasets
 int
 zpool_disable_datasets(zpool_handle_t *zhp, boolean_t force)
 {