CVS commit: [netbsd-9] src/sys/rump/librump/rumpvfs

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Fri Jul  9 17:51:17 UTC 2021

Modified Files:
        src/sys/rump/librump/rumpvfs [netbsd-9]: vm_vfs.c

Log Message:
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)


To generate a diff of this commit:
cvs rdiff -u -r1.34.34.1 -r1.34.34.2 src/sys/rump/librump/rumpvfs/vm_vfs.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/rump/librump/rumpvfs/vm_vfs.c
diff -u src/sys/rump/librump/rumpvfs/vm_vfs.c:1.34.34.1 src/sys/rump/librump/rumpvfs/vm_vfs.c:1.34.34.2
--- src/sys/rump/librump/rumpvfs/vm_vfs.c:1.34.34.1	Tue Jul  6 04:22:34 2021
+++ src/sys/rump/librump/rumpvfs/vm_vfs.c	Fri Jul  9 17:51:17 2021
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
 
@@ -44,6 +44,7 @@ uvm_aio_aiodone_pages(struct vm_page **p
 	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 **p
 
 	}
 	uvm_page_unbusy(pgs, npages);
+	mutex_exit(&uvm_pageqlock);
 	mutex_exit(uobj->vmobjlock);
 }