summaryrefslogtreecommitdiff
path: root/sys/miscfs
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2023-04-09 12:26:36 +0000
committerriastradh <riastradh@NetBSD.org>2023-04-09 12:26:36 +0000
commit6c8c03930aefc003d7f2ed837e4ede02e660cc83 (patch)
treeb79f0e7ed3bf0b66b58576e42939f17c88ef3743 /sys/miscfs
parent4748edaaeccdfe559ef6478352e7cd421c2d0e56 (diff)
genfs: KASSERT(A && B) -> KASSERT(A); KASSERT(B)
Diffstat (limited to 'sys/miscfs')
-rw-r--r--sys/miscfs/genfs/genfs_io.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/miscfs/genfs/genfs_io.c b/sys/miscfs/genfs/genfs_io.c
index acb573fbf9d..2dfb4ae3c18 100644
--- a/sys/miscfs/genfs/genfs_io.c
+++ b/sys/miscfs/genfs/genfs_io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.102 2022/01/14 21:59:50 riastradh Exp $ */
+/* $NetBSD: genfs_io.c,v 1.103 2023/04/09 12:26:36 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.102 2022/01/14 21:59:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.103 2023/04/09 12:26:36 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -184,7 +184,8 @@ startover:
GOP_SIZE(vp, origvsize, &memeof, GOP_SIZE_MEM);
}
KASSERT(ap->a_centeridx >= 0 || ap->a_centeridx <= orignpages);
- KASSERT((origoffset & (PAGE_SIZE - 1)) == 0 && origoffset >= 0);
+ KASSERT((origoffset & (PAGE_SIZE - 1)) == 0);
+ KASSERT(origoffset >= 0);
KASSERT(orignpages > 0);
/*
@@ -890,7 +891,8 @@ genfs_do_putpages(struct vnode *vp, off_t startoff, off_t endoff,
UVMHIST_FUNC("genfs_putpages"); UVMHIST_CALLED(ubchist);
KASSERT(origflags & (PGO_CLEANIT|PGO_FREE|PGO_DEACTIVATE));
- KASSERT((startoff & PAGE_MASK) == 0 && (endoff & PAGE_MASK) == 0);
+ KASSERT((startoff & PAGE_MASK) == 0);
+ KASSERT((endoff & PAGE_MASK) == 0);
KASSERT(startoff < endoff || endoff == 0);
KASSERT(rw_write_held(slock));