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

Patch to fix `reassignbuf: NULL' messages, from cgd.

This commit is contained in:
mycroft 1994-08-29 01:47:02 +00:00
parent 9839fe449e
commit f5232de492
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/kern/vfs_bio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_bio.c,v 1.31 1994/07/03 07:57:32 cgd Exp $ */ /* $NetBSD: vfs_bio.c,v 1.32 1994/08/29 01:47:02 mycroft Exp $ */
/*- /*-
* Copyright (c) 1994 Christopher G. Demetriou * Copyright (c) 1994 Christopher G. Demetriou
@ -304,6 +304,18 @@ bwrite(bp)
wasdelayed = ISSET(bp->b_flags, B_DELWRI); wasdelayed = ISSET(bp->b_flags, B_DELWRI);
CLR(bp->b_flags, (B_READ | B_DONE | B_ERROR | B_DELWRI)); CLR(bp->b_flags, (B_READ | B_DONE | B_ERROR | B_DELWRI));
/*
* If not synchronous, pay for the I/O operation and make
* sure the buf is on the correct vnode queue. We have
* to do this now, because if we don't, the vnode may not
* be properly notified that it's i/o has completed.
*/
if (!sync)
if (wasdelayed)
reassignbuf(bp, bp->b_vp);
else
curproc->p_stats->p_ru.ru_oublock++;
/* Initiate disk write. Make sure the appropriate party is charged. */ /* Initiate disk write. Make sure the appropriate party is charged. */
SET(bp->b_flags, B_WRITEINPROG); SET(bp->b_flags, B_WRITEINPROG);
bp->b_vp->v_numoutput++; bp->b_vp->v_numoutput++;
@ -317,8 +329,10 @@ bwrite(bp)
/* /*
* Pay for the I/O operation, if it's not been paid for, and * Pay for the I/O operation, if it's not been paid for, and
* make sure it's on the correct vnode queue. * make sure it's on the correct vnode queue. (async operatings
* were payed for above.)
*/ */
if (sync)
if (wasdelayed) if (wasdelayed)
reassignbuf(bp, bp->b_vp); reassignbuf(bp, bp->b_vp);
else else