From e065e87c1e9387b881505c8e16738eda5383fa26 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Tue, 4 Nov 2014 19:56:04 +0000 Subject: [PATCH] Fix mis-spelling of bits and types names in the default_pager_putpages() and swap_pager_putpages(). It is the same fix as was done for vnode_pager_putpages() in r271586. Reviewed by: alc Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/vm/default_pager.c | 11 ++++------- sys/vm/swap_pager.c | 9 ++++++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c index a71a22a191ae..26326a5c1e4c 100644 --- a/sys/vm/default_pager.c +++ b/sys/vm/default_pager.c @@ -137,14 +137,11 @@ default_pager_getpages(object, m, count, reqpage) * 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); } /* diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 4745ee6d3858..8b1cf66a6260 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -1280,10 +1280,10 @@ swap_pager_getpages(vm_object_t object, vm_page_t *m, int count, int reqpage) */ 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, vm_page_t *m, int count, 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