From owner-svn-src-user@FreeBSD.ORG  Sat Apr 21 00:32:56 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B2D07106564A;
	Sat, 21 Apr 2012 00:32:56 +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 9EF5B8FC14;
	Sat, 21 Apr 2012 00:32:56 +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 q3L0Wu9T063007;
	Sat, 21 Apr 2012 00:32:56 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3L0Wud6063005;
	Sat, 21 Apr 2012 00:32:56 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201204210032.q3L0Wud6063005@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 21 Apr 2012 00:32:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234522 - user/attilio/vmcontention/sys/vm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Apr 2012 00:32:56 -0000

Author: attilio
Date: Sat Apr 21 00:32:56 2012
New Revision: 234522
URL: http://svn.freebsd.org/changeset/base/234522

Log:
  Fix a brain-o.
  vm_page_lookup_cache() is not exported and cannot be used arbitrarely.
  
  Reported by:	pho

Modified:
  user/attilio/vmcontention/sys/vm/vm_mmap.c

Modified: user/attilio/vmcontention/sys/vm/vm_mmap.c
==============================================================================
--- user/attilio/vmcontention/sys/vm/vm_mmap.c	Sat Apr 21 00:28:29 2012	(r234521)
+++ user/attilio/vmcontention/sys/vm/vm_mmap.c	Sat Apr 21 00:32:56 2012	(r234522)
@@ -81,6 +81,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_pageout.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_page.h>
+#include <vm/vm_radix.h>
 #include <vm/vnode_pager.h>
 
 #ifdef HWPMC_HOOKS
@@ -887,11 +888,13 @@ RestartScan:
 				    object->type == OBJT_VNODE) {
 					pindex = OFF_TO_IDX(current->offset +
 					    (addr - current->start));
-					m = vm_page_lookup(object, pindex);
+					m = vm_radix_lookup(&object->rtree,
+					    pindex, VM_RADIX_ANY);
+
+					/* Lock just for consistency. */
 					mtx_lock(&vm_page_queue_free_mtx);
-					if (m == NULL &&
-					    vm_page_cache_lookup(object,
-					    pindex) != NULL)
+					if (m != NULL &&
+					    (m->flags & PG_CACHED) != 0)
 						mincoreinfo = MINCORE_INCORE;
 					mtx_unlock(&vm_page_queue_free_mtx);
 					if (m != NULL && m->valid == 0)