[src/trunk]: src/sys/kern KASSERT x then y, not (x && y).

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

details:   https://anonhg.NetBSD.org/src/rev/15f86e7103f0
branches:  trunk
changeset: 337793:15f86e7103f0
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Apr 27 20:21:19 2015 +0000

description:
KASSERT x then y, not (x && y).

diffstat:

 sys/kern/kern_veriexec.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r e65bcb2cb489 -r 15f86e7103f0 sys/kern/kern_veriexec.c
--- a/sys/kern/kern_veriexec.c  Mon Apr 27 17:38:01 2015 +0000
+++ b/sys/kern/kern_veriexec.c  Mon Apr 27 20:21:19 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_veriexec.c,v 1.7 2015/04/27 09:17:31 maxv Exp $   */
+/*     $NetBSD: kern_veriexec.c,v 1.8 2015/04/27 20:21:19 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2005, 2006 Elad Efrat <elad%NetBSD.org@localhost>
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.7 2015/04/27 09:17:31 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.8 2015/04/27 20:21:19 riastradh Exp $");
 
 #include "opt_veriexec.h"
 
@@ -428,8 +428,8 @@
        size_t resid, npages;
        int error, do_perpage, pagen;
 
-       KASSERT((file_lock_state != VERIEXEC_LOCKED) &&
-           (file_lock_state != VERIEXEC_UNLOCKED));
+       KASSERT(file_lock_state != VERIEXEC_LOCKED);
+       KASSERT(file_lock_state != VERIEXEC_UNLOCKED);
 
        if (file_lock_state == VERIEXEC_FILE_UNLOCKED)
                vn_lock(vp, LK_SHARED | LK_RETRY);
@@ -645,8 +645,8 @@
        int error = 0;
 
        KASSERT(rw_lock_held(&veriexec_op_lock));
-       KASSERT((file_lock_state != VERIEXEC_LOCKED) &&
-           (file_lock_state != VERIEXEC_UNLOCKED));
+       KASSERT(file_lock_state != VERIEXEC_LOCKED);
+       KASSERT(file_lock_state != VERIEXEC_UNLOCKED);
 
 #define VFE_NEEDS_EVAL(vfe) ((vfe->status == FINGERPRINT_NOTEVAL) || \
                             (vfe->type & VERIEXEC_UNTRUSTED))