Module Name: src
Committed By: riastradh
Date: Sun Apr 9 12:37:12 UTC 2023
Modified Files:
src/sys/uvm: uvm_vnode.c
Log Message:
uvm: Simplify assertion in uvn_get.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/uvm/uvm_vnode.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_vnode.c
diff -u src/sys/uvm/uvm_vnode.c:1.119 src/sys/uvm/uvm_vnode.c:1.120
--- src/sys/uvm/uvm_vnode.c:1.119 Sun Apr 9 09:00:56 2023
+++ src/sys/uvm/uvm_vnode.c Sun Apr 9 12:37:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_vnode.c,v 1.119 2023/04/09 09:00:56 riastradh Exp $ */
+/* $NetBSD: uvm_vnode.c,v 1.120 2023/04/09 12:37:12 riastradh Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.119 2023/04/09 09:00:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.120 2023/04/09 12:37:12 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_uvmhist.h"
@@ -189,8 +189,8 @@ uvn_get(struct uvm_object *uobj, voff_t
error = VOP_GETPAGES(vp, offset, pps, npagesp, centeridx,
access_type, advice, flags);
- KASSERT(((flags & PGO_LOCKED) != 0 && rw_lock_held(uobj->vmobjlock)) ||
- (flags & PGO_LOCKED) == 0);
+ if (flags & PGO_LOCKED)
+ KASSERT(rw_lock_held(uobj->vmobjlock));
return error;
}
