[src/trunk]: src/sys/uvm DRY code in uvm_swap_io() for the write loop

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/07571e109a48
branches:  trunk
changeset: 933214:07571e109a48
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Fri May 22 11:54:05 2020 +0000

description:
DRY code in uvm_swap_io() for the write loop

diffstat:

 sys/uvm/uvm_swap.c |  28 +++++++++++-----------------
 1 files changed, 11 insertions(+), 17 deletions(-)

diffs (53 lines):

diff -r aea85d1d493d -r 07571e109a48 sys/uvm/uvm_swap.c
--- a/sys/uvm/uvm_swap.c        Fri May 22 11:25:06 2020 +0000
+++ b/sys/uvm/uvm_swap.c        Fri May 22 11:54:05 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_swap.c,v 1.191 2020/05/21 16:50:25 riastradh Exp $ */
+/*     $NetBSD: uvm_swap.c,v 1.192 2020/05/22 11:54:05 jdolecek Exp $  */
 
 /*
  * Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.191 2020/05/21 16:50:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.192 2020/05/22 11:54:05 jdolecek Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_compat_netbsd.h"
@@ -1914,25 +1914,19 @@
                KASSERT(sdp->swd_encinit);
                mutex_exit(&uvm_swap_data_lock);
 
-               if (swap_encrypt) {
-                       for (i = 0; i < npages; i++) {
-                               int s = startslot + i;
-                               KDASSERT(swapdrum_sdp_is(s, sdp));
-                               KASSERT(s >= sdp->swd_drumoffset);
-                               s -= sdp->swd_drumoffset;
-                               KASSERT(s < sdp->swd_drumsize);
+               for (i = 0; i < npages; i++) {
+                       int s = startslot + i;
+                       KDASSERT(swapdrum_sdp_is(s, sdp));
+                       KASSERT(s >= sdp->swd_drumoffset);
+                       s -= sdp->swd_drumoffset;
+                       KASSERT(s < sdp->swd_drumsize);
+
+                       if (swap_encrypt) {
                                uvm_swap_encryptpage(sdp,
                                    (void *)(kva + (vsize_t)i*PAGE_SIZE), s);
                                atomic_or_32(&sdp->swd_encmap[s/32],
                                    __BIT(s%32));
-                       }
-               } else {
-                       for (i = 0; i < npages; i++) {
-                               int s = startslot + i;
-                               KDASSERT(swapdrum_sdp_is(s, sdp));
-                               KASSERT(s >= sdp->swd_drumoffset);
-                               s -= sdp->swd_drumoffset;
-                               KASSERT(s < sdp->swd_drumsize);
+                       } else {
                                atomic_and_32(&sdp->swd_encmap[s/32],
                                    ~__BIT(s%32));
                        }