Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lfs_cluster_aiodone: turn an invariant condition into an assertion.

This commit is contained in:
yamt 2004-05-19 11:29:32 +00:00
parent d405fc4436
commit 58912348a7
1 changed files with 49 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
sys/ufs/lfs/lfs_segment.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_segment.c,v 1.152 2004/03/09 07:43:49 yamt Exp $ */
/* $NetBSD: lfs_segment.c,v 1.153 2004/05/19 11:29:32 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.152 2004/03/09 07:43:49 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.153 2004/05/19 11:29:32 yamt Exp $");
#define ivndebug(vp,str) printf("ino %d: %s\n",VTOI(vp)->i_number,(str))
@ -2164,6 +2164,7 @@ lfs_cluster_aiodone(struct buf *bp)
/* Put the pages back, and release the buffer */
while (cl->bufcount--) {
tbp = cl->bpp[cl->bufcount];
KASSERT(tbp->b_flags & B_BUSY);
if (error) {
tbp->b_flags |= B_ERROR;
tbp->b_error = error;
@ -2201,59 +2202,57 @@ lfs_cluster_aiodone(struct buf *bp)
cl->bufcount, (long)tbp->b_flags);
}
#endif
if (tbp->b_flags & (B_BUSY | B_CALL)) {
if ((tbp->b_flags & B_CALL) &&
!LFS_IS_MALLOC_BUF(tbp)) {
/* printf("flags 0x%lx\n", tbp->b_flags); */
/*
* A buffer from the page daemon.
* We use the same iodone as it does,
* so we must manually disassociate its
* buffers from the vp.
*/
if (tbp->b_vp) {
/* This is just silly */
s = splbio();
brelvp(tbp);
tbp->b_vp = vp;
splx(s);
}
/* Put it back the way it was */
tbp->b_flags |= B_ASYNC;
/* Master buffers have B_AGE */
if (tbp->b_private == tbp)
tbp->b_flags |= B_AGE;
}
s = splbio();
biodone(tbp);
if ((tbp->b_flags & B_CALL) && !LFS_IS_MALLOC_BUF(tbp)) {
/* printf("flags 0x%lx\n", tbp->b_flags); */
/*
* If this is the last block for this vnode, but
* there are other blocks on its dirty list,
* set IN_MODIFIED/IN_CLEANING depending on what
* sort of block. Only do this for our mount point,
* not for, e.g., inode blocks that are attached to
* the devvp.
* XXX KS - Shouldn't we set *both* if both types
* of blocks are present (traverse the dirty list?)
* A buffer from the page daemon.
* We use the same iodone as it does,
* so we must manually disassociate its
* buffers from the vp.
*/
simple_lock(&global_v_numoutput_slock);
if (vp != devvp && vp->v_numoutput == 0 &&
(fbp = LIST_FIRST(&vp->v_dirtyblkhd)) != NULL) {
ip = VTOI(vp);
#ifdef DEBUG_LFS
printf("lfs_cluster_aiodone: marking ino %d\n",
ip->i_number);
#endif
if (LFS_IS_MALLOC_BUF(fbp))
LFS_SET_UINO(ip, IN_CLEANING);
else
LFS_SET_UINO(ip, IN_MODIFIED);
if (tbp->b_vp) {
/* This is just silly */
s = splbio();
brelvp(tbp);
tbp->b_vp = vp;
splx(s);
}
simple_unlock(&global_v_numoutput_slock);
splx(s);
wakeup(vp);
/* Put it back the way it was */
tbp->b_flags |= B_ASYNC;
/* Master buffers have B_AGE */
if (tbp->b_private == tbp)
tbp->b_flags |= B_AGE;
}
s = splbio();
biodone(tbp);
/*
* If this is the last block for this vnode, but
* there are other blocks on its dirty list,
* set IN_MODIFIED/IN_CLEANING depending on what
* sort of block. Only do this for our mount point,
* not for, e.g., inode blocks that are attached to
* the devvp.
* XXX KS - Shouldn't we set *both* if both types
* of blocks are present (traverse the dirty list?)
*/
simple_lock(&global_v_numoutput_slock);
if (vp != devvp && vp->v_numoutput == 0 &&
(fbp = LIST_FIRST(&vp->v_dirtyblkhd)) != NULL) {
ip = VTOI(vp);
#ifdef DEBUG_LFS
printf("lfs_cluster_aiodone: marking ino %d\n",
ip->i_number);
#endif
if (LFS_IS_MALLOC_BUF(fbp))
LFS_SET_UINO(ip, IN_CLEANING);
else
LFS_SET_UINO(ip, IN_MODIFIED);
}
simple_unlock(&global_v_numoutput_slock);
splx(s);
wakeup(vp);
}
/* Fix up the cluster buffer, and release it */