Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/ufs/lfs assertions.



details:   https://anonhg.NetBSD.org/src/rev/81b50764dfc0
branches:  trunk
changeset: 552803:81b50764dfc0
user:      yamt <yamt%NetBSD.org@localhost>
date:      Fri Oct 03 15:35:54 2003 +0000

description:
assertions.

diffstat:

 sys/ufs/lfs/lfs_bio.c     |  6 ++++--
 sys/ufs/lfs/lfs_segment.c |  5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r e7479a95bc7b -r 81b50764dfc0 sys/ufs/lfs/lfs_bio.c
--- a/sys/ufs/lfs/lfs_bio.c     Fri Oct 03 15:35:03 2003 +0000
+++ b/sys/ufs/lfs/lfs_bio.c     Fri Oct 03 15:35:54 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_bio.c,v 1.74 2003/09/23 05:26:12 yamt Exp $        */
+/*     $NetBSD: lfs_bio.c,v 1.75 2003/10/03 15:35:54 yamt Exp $        */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.74 2003/09/23 05:26:12 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.75 2003/10/03 15:35:54 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -422,6 +422,8 @@
 
        KASSERT(bp->b_flags & B_BUSY);
        KASSERT(flags & BW_CLEAN || !LFS_IS_MALLOC_BUF(bp));
+       KASSERT((bp->b_flags & (B_DELWRI|B_LOCKED)) != B_DELWRI);
+       KASSERT((bp->b_flags & (B_DELWRI|B_LOCKED)) != B_LOCKED);
 
        /*
         * Don't write *any* blocks if we're mounted read-only.
diff -r e7479a95bc7b -r 81b50764dfc0 sys/ufs/lfs/lfs_segment.c
--- a/sys/ufs/lfs/lfs_segment.c Fri Oct 03 15:35:03 2003 +0000
+++ b/sys/ufs/lfs/lfs_segment.c Fri Oct 03 15:35:54 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_segment.c,v 1.135 2003/10/03 15:35:03 yamt Exp $   */
+/*     $NetBSD: lfs_segment.c,v 1.136 2003/10/03 15:35:54 yamt Exp $   */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.135 2003/10/03 15:35:03 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.136 2003/10/03 15:35:54 yamt Exp $");
 
 #define ivndebug(vp,str) printf("ino %d: %s\n",VTOI(vp)->i_number,(str))
 
@@ -2180,6 +2180,7 @@
                LFS_BCLEAN_LOG(fs, tbp);
 
                if (!(tbp->b_flags & B_CALL)) {
+                       KASSERT(tbp->b_flags & B_LOCKED);
                        s = splbio();
                        simple_lock(&bqueue_slock);
                        bremfree(tbp);



Home | Main Index | Thread Index | Old Index