From owner-svn-src-stable@FreeBSD.ORG  Mon May 10 11:50:26 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8D5D81065675;
	Mon, 10 May 2010 11:50:26 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 7C6458FC1E;
	Mon, 10 May 2010 11:50:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4ABoQBF043067;
	Mon, 10 May 2010 11:50:26 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4ABoQoZ043065;
	Mon, 10 May 2010 11:50:26 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201005101150.o4ABoQoZ043065@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 10 May 2010 11:50:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207845 - stable/8/sys/vm
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 11:50:26 -0000

Author: kib
Date: Mon May 10 11:50:26 2010
New Revision: 207845
URL: http://svn.freebsd.org/changeset/base/207845

Log:
  MFC r207580:
  Handle busy status of the page in a way expected for pager_getpage().
  Flush requested page, unbusy other pages, do not clear m->busy.

Modified:
  stable/8/sys/vm/phys_pager.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/vm/phys_pager.c
==============================================================================
--- stable/8/sys/vm/phys_pager.c	Mon May 10 07:47:31 2010	(r207844)
+++ stable/8/sys/vm/phys_pager.c	Mon May 10 11:50:26 2010	(r207845)
@@ -152,10 +152,10 @@ phys_pager_getpages(vm_object_t object, 
 		KASSERT(m[i]->dirty == 0,
 		    ("phys_pager_getpages: dirty page %p", m[i]));
 		/* The requested page must remain busy, the others not. */
-		if (reqpage != i) {
-			m[i]->oflags &= ~VPO_BUSY;
-			m[i]->busy = 0;
-		}
+		if (i == reqpage)
+			vm_page_flash(m[i]);
+		else
+			vm_page_wakeup(m[i]);
 	}
 	return (VM_PAGER_OK);
 }