[src/trunk]: src/sys/ufs/lfs #if DIAGNOSTIC panic ---> KASSERT

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

details:   https://anonhg.NetBSD.org/src/rev/bf6fe2058376
branches:  trunk
changeset: 352132:bf6fe2058376
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Mar 18 05:43:16 2017 +0000

description:
#if DIAGNOSTIC panic ---> KASSERT

diffstat:

 sys/ufs/lfs/lfs_inode.c |  28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diffs (51 lines):

diff -r d24cdb28a842 -r bf6fe2058376 sys/ufs/lfs/lfs_inode.c
--- a/sys/ufs/lfs/lfs_inode.c   Sat Mar 18 05:33:06 2017 +0000
+++ b/sys/ufs/lfs/lfs_inode.c   Sat Mar 18 05:43:16 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_inode.c,v 1.150 2017/03/16 01:09:24 maya Exp $     */
+/*     $NetBSD: lfs_inode.c,v 1.151 2017/03/18 05:43:16 riastradh Exp $        */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.150 2017/03/16 01:09:24 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.151 2017/03/18 05:43:16 riastradh Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -561,21 +561,19 @@
 done:
        /* Finish segment accounting corrections */
        lfs_update_seguse(fs, oip, lastseg, bc);
-#ifdef DIAGNOSTIC
        for (level = SINGLE; level <= TRIPLE; level++)
-               if ((newblks[ULFS_NDADDR + level] == 0) !=
-                   (lfs_dino_getib(fs, oip->i_din, level) == 0)) {
-                       panic("lfs itrunc1");
-               }
+               KASSERTMSG(((newblks[ULFS_NDADDR + level] == 0) !=
+                       (lfs_dino_getib(fs, oip->i_din, level) == 0)),
+                   "lfs itrunc1");
        for (i = 0; i < ULFS_NDADDR; i++)
-               if ((newblks[i] == 0) !=
-                   (lfs_dino_getdb(fs, oip->i_din, i) == 0)) {
-                       panic("lfs itrunc2");
-               }
-       if (length == 0 &&
-           (!LIST_EMPTY(&ovp->v_cleanblkhd) || !LIST_EMPTY(&ovp->v_dirtyblkhd)))
-               panic("lfs itrunc3");
-#endif /* DIAGNOSTIC */
+               KASSERTMSG(((newblks[i] == 0) !=
+                       (lfs_dino_getdb(fs, oip->i_din, i) == 0)),
+                   "lfs itrunc2");
+       KASSERTMSG((length != 0 || LIST_EMPTY(&ovp->v_cleanblkhd)),
+           "lfs itrunc3a");
+       KASSERTMSG((length != 0 || LIST_EMPTY(&ovp->v_dirtyblkhd)),
+           "lfs itrunc3b");
+
        /*
         * Put back the real size.
         */