From owner-svn-src-user@FreeBSD.ORG  Sun Aug 30 22:35:21 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3142A106566B;
	Sun, 30 Aug 2009 22:35:21 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 204368FC08;
	Sun, 30 Aug 2009 22:35:21 +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 n7UMZLd8008222;
	Sun, 30 Aug 2009 22:35:21 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7UMZL7X008220;
	Sun, 30 Aug 2009 22:35:21 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200908302235.n7UMZL7X008220@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 30 Aug 2009 22:35:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196670 -
	user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Aug 2009 22:35:21 -0000

Author: kmacy
Date: Sun Aug 30 22:35:20 2009
New Revision: 196670
URL: http://svn.freebsd.org/changeset/base/196670

Log:
  integrate 192771
  
  - tell vfs not to refcount the mountpoint, we already do this ourselves

Modified:
  user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c

Modified: user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sun Aug 30 22:33:06 2009	(r196669)
+++ user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sun Aug 30 22:35:20 2009	(r196670)
@@ -4889,6 +4889,13 @@ zfs_freebsd_aclcheck(ap)
 	return (EOPNOTSUPP);
 }
 
+static int 
+zfs_freebsd_getwritemount(struct vop_getwritemount_args *unused)
+{
+
+	return (EOPNOTSUPP);
+}
+
 struct vop_vector zfs_vnodeops;
 struct vop_vector zfs_fifoops;
 
@@ -4903,6 +4910,7 @@ struct vop_vector zfs_vnodeops = {
 #else
 	.vop_lookup =		zfs_freebsd_lookup,
 #endif
+	.vop_getwritemount =	zfs_freebsd_getwritemount,
 	.vop_getattr =		zfs_freebsd_getattr,
 	.vop_setattr =		zfs_freebsd_setattr,
 	.vop_create =		zfs_freebsd_create,