diff options
| author | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 2001-02-21 23:24:33 +0000 |
|---|---|---|
| committer | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 2001-02-21 23:24:33 +0000 |
| commit | 33e6fbe33f4ec84f10016e81c87c7be89171378b (patch) | |
| tree | 122cb8b58569496544bc77d618dec5e995a23b94 /sys/kern/vfs_bio.c | |
| parent | d0a302227eeedfb62540337fcbc0741756591d7c (diff) | |
Latest soft updates from FreeBSD/Kirk McKusick
Snapshot-related code has been commented out.
Diffstat (limited to 'sys/kern/vfs_bio.c')
| -rw-r--r-- | sys/kern/vfs_bio.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 3021d4bbd0d..eae71abafb5 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_bio.c,v 1.28 2001/02/13 19:51:49 art Exp $ */ +/* $OpenBSD: vfs_bio.c,v 1.29 2001/02/21 23:24:30 csapuntz Exp $ */ /* $NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $ */ /*- @@ -475,9 +475,9 @@ brelse(bp) * If it's invalid or empty, dissociate it from its vnode * and put on the head of the appropriate queue. */ - if (LIST_FIRST(&bp->b_dep) != NULL && bioops.io_deallocate) { - (*bioops.io_deallocate)(bp); - } + if (LIST_FIRST(&bp->b_dep) != NULL) + buf_deallocate(bp); + CLR(bp->b_flags, B_DELWRI); if (bp->b_vp) { reassignbuf(bp, bp->b_vp); @@ -787,8 +787,8 @@ start: splx(s); - if (LIST_FIRST(&bp->b_dep) != NULL && bioops.io_deallocate) - (*bioops.io_deallocate)(bp); + if (LIST_FIRST(&bp->b_dep) != NULL) + buf_deallocate(bp); /* clear out various other fields */ bp->b_flags = B_BUSY; @@ -866,8 +866,8 @@ biodone(bp) panic("biodone already"); SET(bp->b_flags, B_DONE); /* note that it's done */ - if (LIST_FIRST(&bp->b_dep) != NULL && bioops.io_complete) - (*bioops.io_complete)(bp); + if (LIST_FIRST(&bp->b_dep) != NULL) + buf_complete(bp); if (!ISSET(bp->b_flags, B_READ)) /* wake up reader */ vwakeup(bp); |