Mon Dec 30 18:18:03 2019 UTC ()

Whitespace.


(ad)

diff -r1.24 -r1.25 src/sys/uvm/uvm_pdpolicy_clock.c

--- src/sys/uvm/uvm_pdpolicy_clock.c 2019/12/30 18:08:38	1.24
+++ src/sys/uvm/uvm_pdpolicy_clock.c 2019/12/30 18:18:03	1.25

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_pdpolicy_clock.c,v 1.24 2019/12/30 18:08:38 ad Exp $	*/
+/*	$NetBSD: uvm_pdpolicy_clock.c,v 1.25 2019/12/30 18:18:03 ad Exp $	*/
 /*	NetBSD: uvm_pdaemon.c,v 1.72 2006/01/05 10:47:33 yamt Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * Copyright (c) 1991, 1993, The Regents of the University of California.
+ *
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * The Mach Operating System project at Carnegie-Mellon University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -59,27 +59,27 @@
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #if defined(PDSIM)
 #include "pdsim.h"
 #else /* defined(PDSIM) */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.24 2019/12/30 18:08:38 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.25 2019/12/30 18:18:03 ad Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_pdpolicy.h>
 #include <uvm/uvm_pdpolicy_impl.h>
 #include <uvm/uvm_stat.h>
 #endif /* defined(PDSIM) */
 @@ -343,27 +343,26 @@ uvmpdpol_balancequeue(int swap_shortage)
 		 * move on to the next.
 		 */
 		mutex_enter(&p->interlock);
 	        if ((p->uobject == NULL && p->uanon == NULL) ||
 	            p->wire_count > 0) {
 	            	mutex_exit(&p->interlock);
 	            	uvmpdpol_pagedequeue_locked(p);
 	            	continue;
+		}
 		/*
 		 * now prepare to move on to the next page.
 		 */
 		TAILQ_REMOVE(&pdpol_state.s_activeq, &marker, pdqueue);
 		TAILQ_INSERT_AFTER(&pdpol_state.s_activeq, p, &marker,
 		    pdqueue);
 		/*
 		 * try to lock the object that owns the page.  see comments
 		 * in uvmpdol_selectvictim().
 	         */
 	        mutex_exit(&s->lock);
         	lock = uvmpd_trylockowner(p);
         	/* p->interlock now released */
         	mutex_enter(&s->lock);
 		if (lock == NULL) {
 @@ -374,27 +373,26 @@ uvmpdpol_balancequeue(int swap_shortage)
 		/*
 		 * if there's a shortage of swap slots, try to free it.
 		 */
 		if (swap_shortage > 0 && (p->flags & PG_SWAPBACKED) != 0 &&
 		    (p->flags & PG_BUSY) == 0) {
 			if (uvmpd_dropswap(p)) {
 				swap_shortage--;
+			}
+		}
 		/*
 		 * if there's a shortage of inactive pages, deactivate.
 		 */
 		if (inactive_shortage > 0) {
 			uvmpdpol_pagedeactivate_locked(p);
 			uvmexp.pddeact++;
 			inactive_shortage--;
+		}
 		mutex_exit(lock);
+	}
 	TAILQ_REMOVE(&pdpol_state.s_activeq, &marker, pdqueue);
 	mutex_exit(&s->lock);
+}
 static void
 uvmpdpol_pagedeactivate_locked(struct vm_page *pg)