svn commit: r243488 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Sat Nov 24 12:46:07 2012
New Revision: 243488
URL: http://svnweb.freebsd.org/changeset/base/243488

Log:
  MFC r242571: zfs_vnode_forget: dispose of larvae vnode using public vfs
  api (mostly)

Modified:
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c	Sat Nov 24 12:44:25 2012	(r243487)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c	Sat Nov 24 12:46:07 2012	(r243488)
@@ -632,12 +632,11 @@ static void
 zfs_vnode_forget(vnode_t *vp)
 {
 
-	VOP_UNLOCK(vp, 0);
-	VI_LOCK(vp);
-	vp->v_usecount--;
-	vp->v_iflag |= VI_DOOMED;
+	/* copied from insmntque_stddtr */
 	vp->v_data = NULL;
-	vdropl(vp);
+	vp->v_op = &dead_vnodeops;
+	vgone(vp);
+	vput(vp);
 }
 
 /*