From owner-svn-src-all@FreeBSD.ORG  Wed Apr  8 04:30:16 2009
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 E64D8106564A;
	Wed,  8 Apr 2009 04:30:16 +0000 (UTC)
	(envelope-from mckay@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D37B98FC13;
	Wed,  8 Apr 2009 04:30:16 +0000 (UTC)
	(envelope-from mckay@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 n384UGmd043590;
	Wed, 8 Apr 2009 04:30:16 GMT (envelope-from mckay@svn.freebsd.org)
Received: (from mckay@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n384UGWw043589;
	Wed, 8 Apr 2009 04:30:16 GMT (envelope-from mckay@svn.freebsd.org)
Message-Id: <200904080430.n384UGWw043589@svn.freebsd.org>
From: Stephen McKay <mckay@FreeBSD.org>
Date: Wed, 8 Apr 2009 04:30:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190837 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb kern
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, 08 Apr 2009 04:30:17 -0000

Author: mckay
Date: Wed Apr  8 04:30:16 2009
New Revision: 190837
URL: http://svn.freebsd.org/changeset/base/190837

Log:
  MFC r187460: Add a limit on namecache entries.
  
  Approved by: re (kib)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/vfs_cache.c

Modified: stable/7/sys/kern/vfs_cache.c
==============================================================================
--- stable/7/sys/kern/vfs_cache.c	Wed Apr  8 03:53:20 2009	(r190836)
+++ stable/7/sys/kern/vfs_cache.c	Wed Apr  8 04:30:16 2009	(r190837)
@@ -495,6 +495,12 @@ cache_enter(dvp, vp, cnp)
 	if (!doingcache)
 		return;
 
+	/*
+	 * Avoid blowout in namecache entries.
+	 */
+	if (numcache >= desiredvnodes * 2)
+		return;
+
 	if (cnp->cn_nameptr[0] == '.') {
 		if (cnp->cn_namelen == 1) {
 			return;