From 67480e8e5f19eb442aefbb3029dcace47d877910 Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 9 Jul 2021 17:51:17 +0000 Subject: [PATCH] Apply patch, requested by chs in ticket #1321: sys/rump/librump/rumpvfs/vm_vfs.c (apply patch) Adapt the changes from ticket #1317 (the uvm_pageqlock does not exist any more in HEAD) --- sys/rump/librump/rumpvfs/vm_vfs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/rump/librump/rumpvfs/vm_vfs.c b/sys/rump/librump/rumpvfs/vm_vfs.c index da63646fb96a..8cf550b2cbd0 100644 --- a/sys/rump/librump/rumpvfs/vm_vfs.c +++ b/sys/rump/librump/rumpvfs/vm_vfs.c @@ -1,4 +1,4 @@ -/* $NetBSD: vm_vfs.c,v 1.34.34.1 2021/07/06 04:22:34 martin Exp $ */ +/* $NetBSD: vm_vfs.c,v 1.34.34.2 2021/07/09 17:51:17 martin Exp $ */ /* * Copyright (c) 2008-2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vm_vfs.c,v 1.34.34.1 2021/07/06 04:22:34 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vm_vfs.c,v 1.34.34.2 2021/07/09 17:51:17 martin Exp $"); #include @@ -44,6 +44,7 @@ uvm_aio_aiodone_pages(struct vm_page **pgs, int npages, bool write, int error) int i; mutex_enter(uobj->vmobjlock); + mutex_enter(&uvm_pageqlock); for (i = 0; i < npages; i++) { pg = pgs[i]; KASSERT((pg->flags & PG_PAGEOUT) == 0 || @@ -59,6 +60,7 @@ uvm_aio_aiodone_pages(struct vm_page **pgs, int npages, bool write, int error) } uvm_page_unbusy(pgs, npages); + mutex_exit(&uvm_pageqlock); mutex_exit(uobj->vmobjlock); }