Protect vnode when updating for started IO on buffers.

This commit is contained in:
pk 1996-06-11 11:15:36 +00:00
parent 72548ecec1
commit 50e7d72655
1 changed files with 7 additions and 3 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_bio.c,v 1.43 1996/04/22 01:38:59 christos Exp $ */
/* $NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $ */
/*-
* Copyright (c) 1994 Christopher G. Demetriou
@ -275,7 +275,7 @@ int
bwrite(bp)
struct buf *bp;
{
int rv, sync, wasdelayed;
int rv, sync, wasdelayed, s;
/*
* Remember buffer type, to switch on it later. If the write was
@ -293,6 +293,7 @@ bwrite(bp)
wasdelayed = ISSET(bp->b_flags, B_DELWRI);
CLR(bp->b_flags, (B_READ | B_DONE | B_ERROR | B_DELWRI));
s = splbio();
if (!sync) {
/*
* If not synchronous, pay for the I/O operation and make
@ -307,8 +308,9 @@ bwrite(bp)
}
/* Initiate disk write. Make sure the appropriate party is charged. */
SET(bp->b_flags, B_WRITEINPROG);
bp->b_vp->v_numoutput++;
splx(s);
SET(bp->b_flags, B_WRITEINPROG);
VOP_STRATEGY(bp);
if (sync) {
@ -322,10 +324,12 @@ bwrite(bp)
* make sure it's on the correct vnode queue. (async operatings
* were payed for above.)
*/
s = splbio();
if (wasdelayed)
reassignbuf(bp, bp->b_vp);
else
curproc->p_stats->p_ru.ru_oublock++;
splx(s);
/* Release the buffer. */
brelse(bp);