Module Name: src
Committed By: hannken
Date: Fri Feb 19 13:20:44 UTC 2021
Modified Files:
src/sys/uvm: uvm_swap.c
Log Message:
When turning off swap during reboot we have to lock with LK_RETRY
as regular files got reclaimed during unmount.
Adresses PR kern/54969 (Disk cache is no longer flushed on shutdown)
To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 src/sys/uvm/uvm_swap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/uvm_swap.c
diff -u src/sys/uvm/uvm_swap.c:1.201 src/sys/uvm/uvm_swap.c:1.202
--- src/sys/uvm/uvm_swap.c:1.201 Tue Feb 16 09:56:32 2021
+++ src/sys/uvm/uvm_swap.c Fri Feb 19 13:20:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_swap.c,v 1.201 2021/02/16 09:56:32 hannken Exp $ */
+/* $NetBSD: uvm_swap.c,v 1.202 2021/02/19 13:20:43 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.201 2021/02/16 09:56:32 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.202 2021/02/19 13:20:43 hannken Exp $");
#include "opt_uvmhist.h"
#include "opt_compat_netbsd.h"
@@ -1155,14 +1155,11 @@ again:
printf("\nturning off swap on %s...", sdp->swd_path);
#endif
/* Have to lock and reference vnode for swap_off(). */
- if (vn_lock(vp = sdp->swd_vp, LK_EXCLUSIVE)) {
- error = EBUSY;
- } else {
- vref(vp);
- error = swap_off(l, sdp);
- vput(vp);
- mutex_enter(&uvm_swap_data_lock);
- }
+ vn_lock(vp = sdp->swd_vp, LK_EXCLUSIVE|LK_RETRY);
+ vref(vp);
+ error = swap_off(l, sdp);
+ vput(vp);
+ mutex_enter(&uvm_swap_data_lock);
if (error) {
printf("stopping swap on %s failed "
"with error %d\n", sdp->swd_path, error);
