From owner-svn-src-stable-9@FreeBSD.ORG  Wed Sep 26 03:54:55 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D4EE6106566B;
	Wed, 26 Sep 2012 03:54:55 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BF42A8FC0A;
	Wed, 26 Sep 2012 03:54:55 +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 q8Q3stxT048144;
	Wed, 26 Sep 2012 03:54:55 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8Q3stwH048142;
	Wed, 26 Sep 2012 03:54:55 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201209260354.q8Q3stwH048142@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Wed, 26 Sep 2012 03:54:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240947 - stable/9/sys/vm
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Sep 2012 03:54:56 -0000

Author: alc
Date: Wed Sep 26 03:54:55 2012
New Revision: 240947
URL: http://svn.freebsd.org/changeset/base/240947

Log:
  MFC r240862
    Address a race condition that was introduced in r238212.  Unless the page
    queues lock is acquired before the page lock is released, there is no
    guarantee that the page will still be in that same page queue when
    vm_page_requeue() is called.

Modified:
  stable/9/sys/vm/vm_pageout.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/vm/vm_pageout.c
==============================================================================
--- stable/9/sys/vm/vm_pageout.c	Wed Sep 26 03:45:42 2012	(r240946)
+++ stable/9/sys/vm/vm_pageout.c	Wed Sep 26 03:54:55 2012	(r240947)
@@ -999,9 +999,9 @@ vm_pageout_scan(int pass)
 			 * Those objects are in a "rundown" state.
 			 */
 			if (!swap_pageouts_ok || (object->flags & OBJ_DEAD)) {
+				vm_page_lock_queues();
 				vm_page_unlock(m);
 				VM_OBJECT_UNLOCK(object);
-				vm_page_lock_queues();
 				queues_locked = TRUE;
 				vm_page_requeue(m);
 				goto relock_queues;