From owner-svn-src-user@freebsd.org Sat Dec 19 01:37:21 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C91BBA4C0E8 for ; Sat, 19 Dec 2015 01:37:21 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 972111A2A; Sat, 19 Dec 2015 01:37:21 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBJ1bKUG005181; Sat, 19 Dec 2015 01:37:20 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBJ1bKJV005180; Sat, 19 Dec 2015 01:37:20 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201512190137.tBJ1bKJV005180@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sat, 19 Dec 2015 01:37:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r292458 - user/alc/PQ_LAUNDRY/sys/vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2015 01:37:21 -0000 Author: markj Date: Sat Dec 19 01:37:20 2015 New Revision: 292458 URL: https://svnweb.freebsd.org/changeset/base/292458 Log: Forcibly swapped-in pages should go in the laundry. Discussed with: alc Modified: user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c Modified: user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c Sat Dec 19 01:24:07 2015 (r292457) +++ user/alc/PQ_LAUNDRY/sys/vm/swap_pager.c Sat Dec 19 01:37:20 2015 (r292458) @@ -1609,7 +1609,7 @@ swap_pager_isswapped(vm_object_t object, * * This routine dissociates the page at the given index within a * swap block from its backing store, paging it in if necessary. - * If the page is paged in, it is placed in the inactive queue, + * If the page is paged in, it is placed in the laundry queue, * since it had its backing store ripped out from under it. * We also attempt to swap in all other pages in the swap block, * we only guarantee that the one at the specified index is @@ -1641,7 +1641,7 @@ swp_pager_force_pagein(vm_object_t objec vm_object_pip_wakeup(object); vm_page_dirty(m); vm_page_lock(m); - vm_page_deactivate(m); + vm_page_laundry(m); vm_page_unlock(m); vm_page_xunbusy(m); vm_pager_page_unswapped(m);