From owner-svn-src-all@FreeBSD.ORG  Wed Dec 10 17:16:11 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 53CB5106564A;
	Wed, 10 Dec 2008 17:16:11 +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 444AF8FC2C;
	Wed, 10 Dec 2008 17:16:11 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAHGBaP037368;
	Wed, 10 Dec 2008 17:16:11 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBAHGBRo037367;
	Wed, 10 Dec 2008 17:16:11 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200812101716.mBAHGBRo037367@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 10 Dec 2008 17:16:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185868 - in releng/7.1/sys: . contrib/pf dev/cxgb
	fs/nullfs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Dec 2008 17:16:11 -0000

Author: kib
Date: Wed Dec 10 17:16:11 2008
New Revision: 185868
URL: http://svn.freebsd.org/changeset/base/185868

Log:
  MFC r185335:
  In null_lookup(), do the needed cleanup instead of panicing saying
  the cleanup is needed.
  
  Approved by:	re (kensmith)

Modified:
  releng/7.1/sys/   (props changed)
  releng/7.1/sys/contrib/pf/   (props changed)
  releng/7.1/sys/dev/cxgb/   (props changed)
  releng/7.1/sys/fs/nullfs/null_vnops.c

Modified: releng/7.1/sys/fs/nullfs/null_vnops.c
==============================================================================
--- releng/7.1/sys/fs/nullfs/null_vnops.c	Wed Dec 10 17:07:13 2008	(r185867)
+++ releng/7.1/sys/fs/nullfs/null_vnops.c	Wed Dec 10 17:16:11 2008	(r185868)
@@ -365,11 +365,10 @@ null_lookup(struct vop_lookup_args *ap)
 			vrele(lvp);
 		} else {
 			error = null_nodeget(dvp->v_mount, lvp, &vp);
-			if (error) {
-				/* XXX Cleanup needed... */
-				panic("null_nodeget failed");
-			}
-			*ap->a_vpp = vp;
+			if (error)
+				vput(lvp);
+			else
+				*ap->a_vpp = vp;
 		}
 	}
 	return (error);