Jared, please test if the attached diff is sufficient. -- J. Hannken-Illjes - hannken%eis.cs.tu-bs.de@localhost - TU Braunschweig
Attachment:
uvm_swap.c.diff
Description: Binary data
> On 17. Feb 2021, at 13:07, Jared McNeill <jmcneill%invisible.ca@localhost> wrote: > > I noticed this on reboot since this change: > > [ 3636.2891122] turning off swap...stopping swap on /swap failed with error 16 > [ 3636.2991109] stopping swap on /swap2 failed with error 16 > > Can you have a look? > > Thanks! > Jared > > > On Tue, 16 Feb 2021, Juergen Hannken-Illjes wrote: > >> Module Name: src >> Committed By: hannken >> Date: Tue Feb 16 09:56:32 UTC 2021 >> >> Modified Files: >> src/sys/kern: vfs_mount.c >> src/sys/uvm: uvm_swap.c >> >> Log Message: >> Reorganize uvm_swap_shutdown() a bit, make sure the vnode gets >> locked and referenced across the call to swap_off() and finally >> use it from vfs_unmountall1() to remove swap after unmounting >> the last file system. >> >> Adresses PR kern/54969 (Disk cache is no longer flushed on shutdown) >> >> >> To generate a diff of this commit: >> cvs rdiff -u -r1.85 -r1.86 src/sys/kern/vfs_mount.c >> cvs rdiff -u -r1.200 -r1.201 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. >> >>
Attachment:
signature.asc
Description: Message signed with OpenPGP