From owner-svn-src-head@FreeBSD.ORG  Sun Nov  4 14:24:00 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B9250D15;
 Sun,  4 Nov 2012 14:24:00 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id A0A528FC08;
 Sun,  4 Nov 2012 14:24:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA4EO0sp007135;
 Sun, 4 Nov 2012 14:24:00 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4EO0cA007133;
 Sun, 4 Nov 2012 14:24:00 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201211041424.qA4EO0cA007133@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 4 Nov 2012 14:24:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242571 -
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: head
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.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 14:24:00 -0000

Author: avg
Date: Sun Nov  4 14:24:00 2012
New Revision: 242571
URL: http://svn.freebsd.org/changeset/base/242571

Log:
  zfs_vnode_forget: dispose of larvae vnode using public vfs api (mostly)
  
  Reviewed by:	kib
  MFC after:	19 days

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

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c	Sun Nov  4 14:22:25 2012	(r242570)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c	Sun Nov  4 14:24:00 2012	(r242571)
@@ -633,12 +633,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);
 }
 
 /*