Module Name: src
Committed By: riastradh
Date: Tue May 3 19:43:45 UTC 2016
Modified Files:
src/sys/kern: vfs_wapbl.c
Log Message:
Fix non-DIAGNOSTIC build.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 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.66 src/sys/kern/vfs_wapbl.c:1.67
--- src/sys/kern/vfs_wapbl.c:1.66 Tue May 3 19:17:16 2016
+++ src/sys/kern/vfs_wapbl.c Tue May 3 19:43:45 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_wapbl.c,v 1.66 2016/05/03 19:17:16 riastradh Exp $ */
+/* $NetBSD: vfs_wapbl.c,v 1.67 2016/05/03 19:43:45 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.66 2016/05/03 19:17:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.67 2016/05/03 19:43:45 riastradh Exp $");
#include <sys/param.h>
#include <sys/bitops.h>
@@ -976,13 +976,13 @@ wapbl_end(struct wapbl *wl)
wl->wl_bufbytes, wl->wl_bcount));
#endif
- size_t flushsize = wapbl_transaction_len(wl);
/*
* 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),
+ KASSERTMSG((wapbl_transaction_len(wl) <=
+ (wl->wl_circ_size - wl->wl_reserved_bytes)),
"wapbl_end: current transaction too big to flush");
mutex_enter(&wl->wl_mtx);
