From owner-svn-src-stable-10@FreeBSD.ORG Tue Nov 11 11:06:12 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0D7D87F4; Tue, 11 Nov 2014 11:06:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D45079B4; Tue, 11 Nov 2014 11:06:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sABB6BY8011274; Tue, 11 Nov 2014 11:06:11 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sABB6B4o011272; Tue, 11 Nov 2014 11:06:11 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201411111106.sABB6B4o011272@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 11 Nov 2014 11:06:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r274375 - stable/10/sys/vm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Nov 2014 11:06:12 -0000 Author: kib Date: Tue Nov 11 11:06:10 2014 New Revision: 274375 URL: https://svnweb.freebsd.org/changeset/base/274375 Log: MFC r274100: Fix mis-spelling of bits and types names in the default_pager_putpages() and swap_pager_putpages(). Modified: stable/10/sys/vm/default_pager.c stable/10/sys/vm/swap_pager.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/default_pager.c ============================================================================== --- stable/10/sys/vm/default_pager.c Tue Nov 11 10:22:33 2014 (r274374) +++ stable/10/sys/vm/default_pager.c Tue Nov 11 11:06:10 2014 (r274375) @@ -137,14 +137,11 @@ default_pager_getpages(object, m, count, * cache to the free list. */ static void -default_pager_putpages(object, m, c, sync, rtvals) - vm_object_t object; - vm_page_t *m; - int c; - boolean_t sync; - int *rtvals; +default_pager_putpages(vm_object_t object, vm_page_t *m, int count, + int flags, int *rtvals) { - swappagerops.pgo_putpages(object, m, c, sync, rtvals); + + swappagerops.pgo_putpages(object, m, count, flags, rtvals); } /* Modified: stable/10/sys/vm/swap_pager.c ============================================================================== --- stable/10/sys/vm/swap_pager.c Tue Nov 11 10:22:33 2014 (r274374) +++ stable/10/sys/vm/swap_pager.c Tue Nov 11 11:06:10 2014 (r274375) @@ -1280,10 +1280,10 @@ swap_pager_getpages(vm_object_t object, */ void swap_pager_putpages(vm_object_t object, vm_page_t *m, int count, - boolean_t sync, int *rtvals) + int flags, int *rtvals) { - int i; - int n = 0; + int i, n; + boolean_t sync; if (count && m[0]->object != object) { panic("swap_pager_putpages: object mismatch %p/%p", @@ -1303,8 +1303,11 @@ swap_pager_putpages(vm_object_t object, swp_pager_meta_build(object, 0, SWAPBLK_NONE); VM_OBJECT_WUNLOCK(object); + n = 0; if (curproc != pageproc) sync = TRUE; + else + sync = (flags & VM_PAGER_PUT_SYNC) != 0; /* * Step 2