From owner-svn-src-user@FreeBSD.ORG  Sat Jun 27 06:05:10 2009
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 89B4B106566C;
	Sat, 27 Jun 2009 06:05:10 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 78C228FC19;
	Sat, 27 Jun 2009 06:05:10 +0000 (UTC)
	(envelope-from kmacy@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 n5R65AM1047782;
	Sat, 27 Jun 2009 06:05:10 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5R65ArM047780;
	Sat, 27 Jun 2009 06:05:10 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906270605.n5R65ArM047780@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 27 Jun 2009 06:05:10 +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: r195094 - user/kmacy/releng_7_2_fcs/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, 27 Jun 2009 06:05:10 -0000

Author: kmacy
Date: Sat Jun 27 06:05:10 2009
New Revision: 195094
URL: http://svn.freebsd.org/changeset/base/195094

Log:
  verify that the page has a corresponding object before trying to grab the object lock for it

Modified:
  user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c

Modified: user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c	Sat Jun 27 05:27:34 2009	(r195093)
+++ user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c	Sat Jun 27 06:05:10 2009	(r195094)
@@ -1089,7 +1089,7 @@ unlock_and_continue:
 
 		next = TAILQ_NEXT(m, pageq);
 		object = m->object;
-		if ((m->flags & PG_MARKER) != 0) {
+		if ((object == NULL) || (m->flags & PG_MARKER) != 0) {
 			m = next;
 			continue;
 		}