Module Name: src
Committed By: uebayasi
Date: Thu May 26 04:51:57 UTC 2011
Modified Files:
src/sys/kern: vfs_wapbl.c
Log Message:
Catch up with B_* flag name changes in debug code.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 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.43 src/sys/kern/vfs_wapbl.c:1.44
--- src/sys/kern/vfs_wapbl.c:1.43 Sun Feb 20 11:21:34 2011
+++ src/sys/kern/vfs_wapbl.c Thu May 26 04:51:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_wapbl.c,v 1.43 2011/02/20 11:21:34 nakayama Exp $ */
+/* $NetBSD: vfs_wapbl.c,v 1.44 2011/05/26 04:51:57 uebayasi 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.43 2011/02/20 11:21:34 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.44 2011/05/26 04:51:57 uebayasi Exp $");
#include <sys/param.h>
#include <sys/bitops.h>
@@ -1245,14 +1245,14 @@
}
#ifdef ohbother
- KDASSERT(bp->b_flags & B_DONE);
- KDASSERT(!(bp->b_flags & B_DELWRI));
+ KDASSERT(bp->b_oflags & BO_DONE);
+ KDASSERT(!(bp->b_oflags & BO_DELWRI));
KDASSERT(bp->b_flags & B_ASYNC);
- KDASSERT(bp->b_flags & B_BUSY);
+ KDASSERT(bp->b_cflags & BC_BUSY);
KDASSERT(!(bp->b_flags & B_LOCKED));
KDASSERT(!(bp->b_flags & B_READ));
- KDASSERT(!(bp->b_flags & B_INVAL));
- KDASSERT(!(bp->b_flags & B_NOCACHE));
+ KDASSERT(!(bp->b_cflags & BC_INVAL));
+ KDASSERT(!(bp->b_cflags & BC_NOCACHE));
#endif
if (bp->b_error) {
