Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Sep 2014 09:09:37 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r271925 - stable/10/sys/vm
Message-ID:  <201409210909.s8L99b0k063941@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kib
Date: Sun Sep 21 09:09:37 2014
New Revision: 271925
URL: http://svnweb.freebsd.org/changeset/base/271925

Log:
  MFC r271586:
  Fix mis-spelling of bits and types names in the vnode_pager_putpages().
  
  Approved by:	re (delphij)

Modified:
  stable/10/sys/vm/vnode_pager.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/vm/vnode_pager.c
==============================================================================
--- stable/10/sys/vm/vnode_pager.c	Sun Sep 21 09:06:50 2014	(r271924)
+++ stable/10/sys/vm/vnode_pager.c	Sun Sep 21 09:09:37 2014	(r271925)
@@ -83,7 +83,7 @@ static int vnode_pager_input_smlfs(vm_ob
 static int vnode_pager_input_old(vm_object_t object, vm_page_t m);
 static void vnode_pager_dealloc(vm_object_t);
 static int vnode_pager_getpages(vm_object_t, vm_page_t *, int, int);
-static void vnode_pager_putpages(vm_object_t, vm_page_t *, int, boolean_t, int *);
+static void vnode_pager_putpages(vm_object_t, vm_page_t *, int, int, int *);
 static boolean_t vnode_pager_haspage(vm_object_t, vm_pindex_t, int *, int *);
 static vm_object_t vnode_pager_alloc(void *, vm_ooffset_t, vm_prot_t,
     vm_ooffset_t, struct ucred *cred);
@@ -1024,12 +1024,8 @@ vnode_pager_generic_getpages(vp, m, byte
  * backing vp's VOP_PUTPAGES.
  */
 static void
-vnode_pager_putpages(object, m, count, sync, rtvals)
-	vm_object_t object;
-	vm_page_t *m;
-	int count;
-	boolean_t sync;
-	int *rtvals;
+vnode_pager_putpages(vm_object_t object, vm_page_t *m, int count,
+    int flags, int *rtvals)
 {
 	int rtval;
 	struct vnode *vp;
@@ -1047,15 +1043,15 @@ vnode_pager_putpages(object, m, count, s
 	 * daemon up.  This should be probably be addressed XXX.
 	 */
 
-	if ((cnt.v_free_count + cnt.v_cache_count) < cnt.v_pageout_free_min)
-		sync |= OBJPC_SYNC;
+	if (cnt.v_free_count + cnt.v_cache_count < cnt.v_pageout_free_min)
+		flags |= VM_PAGER_PUT_SYNC;
 
 	/*
 	 * Call device-specific putpages function
 	 */
 	vp = object->handle;
 	VM_OBJECT_WUNLOCK(object);
-	rtval = VOP_PUTPAGES(vp, m, bytes, sync, rtvals, 0);
+	rtval = VOP_PUTPAGES(vp, m, bytes, flags, rtvals, 0);
 	KASSERT(rtval != EOPNOTSUPP, 
 	    ("vnode_pager: stale FS putpages\n"));
 	VM_OBJECT_WLOCK(object);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409210909.s8L99b0k063941>