Module Name: src
Committed By: riastradh
Date: Tue May 3 19:15:29 UTC 2016
Modified Files:
src/sys/kern: vfs_wapbl.c
Log Message:
#ifdef DIAGNOSTIC panic ---> KASSERTMSG
>From coypu.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 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.64 src/sys/kern/vfs_wapbl.c:1.65
--- src/sys/kern/vfs_wapbl.c:1.64 Sun Nov 15 03:09:39 2015
+++ src/sys/kern/vfs_wapbl.c Tue May 3 19:15:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_wapbl.c,v 1.64 2015/11/15 03:09:39 pgoyette Exp $ */
+/* $NetBSD: vfs_wapbl.c,v 1.65 2016/05/03 19:15:29 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.64 2015/11/15 03:09:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.65 2016/05/03 19:15:29 riastradh Exp $");
#include <sys/param.h>
#include <sys/bitops.h>
@@ -976,17 +976,14 @@ wapbl_end(struct wapbl *wl)
wl->wl_bufbytes, wl->wl_bcount));
#endif
-#ifdef DIAGNOSTIC
size_t flushsize = wapbl_transaction_len(wl);
- if (flushsize > (wl->wl_circ_size - wl->wl_reserved_bytes)) {
- /*
- * XXX this could be handled more gracefully, perhaps place
- * only a partial transaction in the log and allow the
- * remaining to flush without the protection of the journal.
- */
- panic("wapbl_end: current transaction too big to flush\n");
- }
-#endif
+ /*
+ * XXX this could be handled more gracefully, perhaps place
+ * only a partial transaction in the log and allow the
+ * remaining to flush without the protection of the journal.
+ */
+ KASSERTMSG(flushsize <= (wl->wl_circ_size - wl->wl_reserved_bytes),
+ "wapbl_end: current transaction too big to flush");
mutex_enter(&wl->wl_mtx);
KASSERT(wl->wl_lock_count > 0);
