mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-14 10:09:48 +00:00
Code Issues Releases Activity

Finally get rid of this bothering ``biodone: buffer already done''

Browse Source 
warning.  The buffer needs only to be `biodone()' again if the format
operation timed out; otherwise fdstate() did already do the job.
This commit is contained in:
Joerg Wunsch 1995-03-12 22:40:56 +00:00
parent 40ac60750c
commit 82f5379bc5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=7042
3 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/fdc/fdc.c
View File

@ -43,7 +43,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91 * from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.51 1995/01/27 20:03:07 jkh Exp $ * $Id: fd.c,v 1.52 1995/02/26 01:37:51 bde Exp $
* *
*/ */
@ -1682,6 +1682,10 @@ fdformat(dev, finfo, p)
bp = (struct buf *)malloc(sizeof(struct buf), M_TEMP, M_NOWAIT); bp = (struct buf *)malloc(sizeof(struct buf), M_TEMP, M_NOWAIT);
if(bp == 0) if(bp == 0)
return ENOBUFS; return ENOBUFS;
/*
* keep the process from being swapped
*/
p->p_flag |= P_PHYSIO;
bzero((void *)bp, sizeof(struct buf)); bzero((void *)bp, sizeof(struct buf));
bp->b_flags = B_BUSY | B_PHYS | B_FORMAT; bp->b_flags = B_BUSY | B_PHYS | B_FORMAT;
bp->b_proc = p; bp->b_proc = p;
@ -1710,12 +1714,17 @@ fdformat(dev, finfo, p)
} }
splx(s); splx(s);
if(rv == EWOULDBLOCK) if(rv == EWOULDBLOCK) {
/* timed out */ /* timed out */
rv = EIO; rv = EIO;
biodone(bp);
}
if(bp->b_flags & B_ERROR) if(bp->b_flags & B_ERROR)
rv = bp->b_error; rv = bp->b_error;
biodone(bp); /*
* allow the process to be swapped
*/
p->p_flag &= ~P_PHYSIO;
free(bp, M_TEMP); free(bp, M_TEMP);
return rv; return rv;
} }

15
sys/i386/isa/fd.c
View File

@ -43,7 +43,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91 * from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.51 1995/01/27 20:03:07 jkh Exp $ * $Id: fd.c,v 1.52 1995/02/26 01:37:51 bde Exp $
* *
*/ */
@ -1682,6 +1682,10 @@ fdformat(dev, finfo, p)
bp = (struct buf *)malloc(sizeof(struct buf), M_TEMP, M_NOWAIT); bp = (struct buf *)malloc(sizeof(struct buf), M_TEMP, M_NOWAIT);
if(bp == 0) if(bp == 0)
return ENOBUFS; return ENOBUFS;
/*
* keep the process from being swapped
*/
p->p_flag |= P_PHYSIO;
bzero((void *)bp, sizeof(struct buf)); bzero((void *)bp, sizeof(struct buf));
bp->b_flags = B_BUSY | B_PHYS | B_FORMAT; bp->b_flags = B_BUSY | B_PHYS | B_FORMAT;
bp->b_proc = p; bp->b_proc = p;
@ -1710,12 +1714,17 @@ fdformat(dev, finfo, p)
} }
splx(s); splx(s);
if(rv == EWOULDBLOCK) if(rv == EWOULDBLOCK) {
/* timed out */ /* timed out */
rv = EIO; rv = EIO;
biodone(bp);
}
if(bp->b_flags & B_ERROR) if(bp->b_flags & B_ERROR)
rv = bp->b_error; rv = bp->b_error;
biodone(bp); /*
* allow the process to be swapped
*/
p->p_flag &= ~P_PHYSIO;
free(bp, M_TEMP); free(bp, M_TEMP);
return rv; return rv;
} }

15
sys/isa/fd.c
View File

@ -43,7 +43,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91 * from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.51 1995/01/27 20:03:07 jkh Exp $ * $Id: fd.c,v 1.52 1995/02/26 01:37:51 bde Exp $
* *
*/ */
@ -1682,6 +1682,10 @@ fdformat(dev, finfo, p)
bp = (struct buf *)malloc(sizeof(struct buf), M_TEMP, M_NOWAIT); bp = (struct buf *)malloc(sizeof(struct buf), M_TEMP, M_NOWAIT);
if(bp == 0) if(bp == 0)
return ENOBUFS; return ENOBUFS;
/*
* keep the process from being swapped
*/
p->p_flag |= P_PHYSIO;
bzero((void *)bp, sizeof(struct buf)); bzero((void *)bp, sizeof(struct buf));
bp->b_flags = B_BUSY | B_PHYS | B_FORMAT; bp->b_flags = B_BUSY | B_PHYS | B_FORMAT;
bp->b_proc = p; bp->b_proc = p;
@ -1710,12 +1714,17 @@ fdformat(dev, finfo, p)
} }
splx(s); splx(s);
if(rv == EWOULDBLOCK) if(rv == EWOULDBLOCK) {
/* timed out */ /* timed out */
rv = EIO; rv = EIO;
biodone(bp);
}
if(bp->b_flags & B_ERROR) if(bp->b_flags & B_ERROR)
rv = bp->b_error; rv = bp->b_error;
biodone(bp); /*
* allow the process to be swapped
*/
p->p_flag &= ~P_PHYSIO;
free(bp, M_TEMP); free(bp, M_TEMP);
return rv; return rv;
} }