svn commit: r274375 - stable/10/sys/vm

Konstantin Belousov kib at FreeBSD.org
Tue Nov 11 11:06:12 UTC 2014


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


More information about the svn-src-all mailing list