[src/trunk]: src/sys/miscfs/genfs genfs: KASSERT(A && B) -> KASSERT(A); KASSE...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/02d396914b1f
branches:  trunk
changeset: 374191:02d396914b1f
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Apr 09 12:26:36 2023 +0000

description:
genfs: KASSERT(A && B) -> KASSERT(A); KASSERT(B)

diffstat:

 sys/miscfs/genfs/genfs_io.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r b50cf0c60254 -r 02d396914b1f sys/miscfs/genfs/genfs_io.c
--- a/sys/miscfs/genfs/genfs_io.c       Sun Apr 09 12:21:59 2023 +0000
+++ b/sys/miscfs/genfs/genfs_io.c       Sun Apr 09 12:26:36 2023 +0000
@@ -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_
        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));