svn commit: r196670 - user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Kip Macy]

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,