[src/trunk]: src/sys/uvm Return immediately from uvm_swap_shutdown() if there...

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

details:   https://anonhg.NetBSD.org/src/rev/85ac2524414e
branches:  trunk
changeset: 1023092:85ac2524414e
user:      hannken <hannken%NetBSD.org@localhost>
date:      Mon Aug 23 13:08:18 2021 +0000

description:
Return immediately from uvm_swap_shutdown() if there are
no (more) swap devices configured.

diffstat:

 sys/uvm/uvm_swap.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r af673c9860e5 -r 85ac2524414e sys/uvm/uvm_swap.c
--- a/sys/uvm/uvm_swap.c        Mon Aug 23 06:50:01 2021 +0000
+++ b/sys/uvm/uvm_swap.c        Mon Aug 23 13:08:18 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_swap.c,v 1.205 2021/06/03 20:18:06 riastradh Exp $ */
+/*     $NetBSD: uvm_swap.c,v 1.206 2021/08/23 13:08:18 hannken 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.205 2021/06/03 20:18:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.206 2021/08/23 13:08:18 hannken Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_compat_netbsd.h"
@@ -1149,7 +1149,7 @@
        struct vnode *vp;
        int error;
 
-       if (!uvm_swap_init_done)
+       if (!uvm_swap_init_done || uvmexp.nswapdev == 0)
                return;
        printf("turning off swap...");
        rw_enter(&swap_syscall_lock, RW_WRITER);