From owner-svn-src-all@FreeBSD.ORG  Sat Jun 16 21:39:01 2012
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 3DE811065673;
	Sat, 16 Jun 2012 21:39:01 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 26AAA8FC2B;
	Sat, 16 Jun 2012 21:39:01 +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 q5GLd1QO067247;
	Sat, 16 Jun 2012 21:39:01 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5GLd0Ck067245;
	Sat, 16 Jun 2012 21:39:00 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201206162139.q5GLd0Ck067245@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 16 Jun 2012 21:39:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237172 - head/sys/vm
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: Sat, 16 Jun 2012 21:39:01 -0000

Author: attilio
Date: Sat Jun 16 21:39:00 2012
New Revision: 237172
URL: http://svn.freebsd.org/changeset/base/237172

Log:
  Do a more targeted check on the page cache and avoid to check the cache
  pointer directly in vnode_pager_setsize() by using newly introduced
  vm_page_is_cached() function.
  
  Reviewed by:	alc
  MFC after:	2 weeks
  X-MFC:		r234039,234064

Modified:
  head/sys/vm/vnode_pager.c

Modified: head/sys/vm/vnode_pager.c
==============================================================================
--- head/sys/vm/vnode_pager.c	Sat Jun 16 21:37:15 2012	(r237171)
+++ head/sys/vm/vnode_pager.c	Sat Jun 16 21:39:00 2012	(r237172)
@@ -440,7 +440,7 @@ vnode_pager_setsize(vp, nsize)
 			 */
 			vm_page_clear_dirty(m, base, PAGE_SIZE - base);
 		} else if ((nsize & PAGE_MASK) &&
-		    __predict_false(object->cache != NULL)) {
+		    vm_page_is_cached(object, OFF_TO_IDX(nsize))) {
 			vm_page_cache_free(object, OFF_TO_IDX(nsize),
 			    nobjsize);
 		}