Module Name: src
Committed By: riastradh
Date: Sat May 7 20:18:44 UTC 2016
Modified Files:
src/sys/kern: vfs_wapbl.c
Log Message:
Turn WAPBL_DEBUG panic or KASSERT into KASSERTMSG
>From coypu.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/kern/vfs_wapbl.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/kern/vfs_wapbl.c
diff -u src/sys/kern/vfs_wapbl.c:1.71 src/sys/kern/vfs_wapbl.c:1.72
--- src/sys/kern/vfs_wapbl.c:1.71 Sat May 7 20:16:38 2016
+++ src/sys/kern/vfs_wapbl.c Sat May 7 20:18:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_wapbl.c,v 1.71 2016/05/07 20:16:38 riastradh Exp $ */
+/* $NetBSD: vfs_wapbl.c,v 1.72 2016/05/07 20:18:44 riastradh Exp $ */
/*-
* Copyright (c) 2003, 2008, 2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#define WAPBL_INTERNAL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.71 2016/05/07 20:16:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.72 2016/05/07 20:18:44 riastradh Exp $");
#include <sys/param.h>
#include <sys/bitops.h>
@@ -1650,16 +1650,12 @@ wapbl_flush(struct wapbl *wl, int waitfo
wapbl_advance_head(wl->wl_circ_size, wl->wl_circ_off, flushsize,
&head, &tail);
-#ifdef WAPBL_DEBUG
- if (head != off) {
- panic("lost head! head=%"PRIdMAX" tail=%" PRIdMAX
- " off=%"PRIdMAX" flush=%zu",
- (intmax_t)head, (intmax_t)tail, (intmax_t)off,
- flushsize);
- }
-#else
- KASSERT(head == off);
-#endif
+
+ KASSERTMSG(head == off,
+ "lost head! head=%"PRIdMAX" tail=%" PRIdMAX
+ " off=%"PRIdMAX" flush=%zu",
+ (intmax_t)head, (intmax_t)tail, (intmax_t)off,
+ flushsize);
/* Opportunistically move the tail forward if we can */
if (!wapbl_lazy_truncate) {
