From owner-svn-src-stable-9@FreeBSD.ORG  Tue Nov  1 15:38:41 2011
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DF299106566B;
	Tue,  1 Nov 2011 15:38:41 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CEA5F8FC13;
	Tue,  1 Nov 2011 15:38:41 +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 pA1FcfPe072788;
	Tue, 1 Nov 2011 15:38:41 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA1FcfFK072786;
	Tue, 1 Nov 2011 15:38:41 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201111011538.pA1FcfFK072786@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Tue, 1 Nov 2011 15:38:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226989 - stable/9/sys/fs/nullfs
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Nov 2011 15:38:42 -0000

Author: kib
Date: Tue Nov  1 15:38:41 2011
New Revision: 226989
URL: http://svn.freebsd.org/changeset/base/226989

Log:
  MFC r226687:
  The only possible error return from null_nodeget() is due to insmntque1
  failure (the getnewvnode cannot return an error). In this case, the
  null_insmntque_dtr() already unlocked the reclaimed vnode, so VOP_UNLOCK()
  in the nullfs_mount() after null_nodeget() failure is wrong.
  
  Approved by:	re (bz)

Modified:
  stable/9/sys/fs/nullfs/null_vfsops.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/fs/nullfs/null_vfsops.c
==============================================================================
--- stable/9/sys/fs/nullfs/null_vfsops.c	Tue Nov  1 15:34:52 2011	(r226988)
+++ stable/9/sys/fs/nullfs/null_vfsops.c	Tue Nov  1 15:38:41 2011	(r226989)
@@ -157,7 +157,6 @@ nullfs_mount(struct mount *mp)
 	 * Make sure the node alias worked
 	 */
 	if (error) {
-		VOP_UNLOCK(vp, 0);
 		vrele(lowerrootvp);
 		free(xmp, M_NULLFSMNT);	/* XXX */
 		return (error);