diff options
-rw-r--r-- | sys/dev/vinum/vinumio.c | 4 | ||||
-rw-r--r-- | sys/dev/vinum/vinumrevive.c | 12 | ||||
-rw-r--r-- | sys/gnu/ext2fs/ext2_bmap.c | 2 | ||||
-rw-r--r-- | sys/gnu/ext2fs/ext2_inode.c | 2 | ||||
-rw-r--r-- | sys/gnu/fs/ext2fs/ext2_bmap.c | 2 | ||||
-rw-r--r-- | sys/gnu/fs/ext2fs/ext2_inode.c | 2 | ||||
-rw-r--r-- | sys/kern/subr_disklabel.c | 8 | ||||
-rw-r--r-- | sys/kern/subr_diskmbr.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_bio.c | 6 | ||||
-rw-r--r-- | sys/kern/vfs_cluster.c | 2 | ||||
-rw-r--r-- | sys/nfs/nfs_vnops.c | 2 | ||||
-rw-r--r-- | sys/nfsclient/nfs_vnops.c | 2 | ||||
-rw-r--r-- | sys/pc98/pc98/diskslice_machdep.c | 4 | ||||
-rw-r--r-- | sys/sys/bio.h | 2 | ||||
-rw-r--r-- | sys/sys/buf.h | 2 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_inode.c | 2 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_bmap.c | 2 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_disksubr.c | 8 |
18 files changed, 34 insertions, 34 deletions
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c index ee662d1..5c18ff7 100644 --- a/sys/dev/vinum/vinumio.c +++ b/sys/dev/vinum/vinumio.c @@ -309,7 +309,7 @@ driveio(struct drive *drive, char *buf, size_t length, off_t offset, int flag) bp->b_data = buf; bp->b_bcount = len; DEV_STRATEGY(bp, 0); /* initiate the transfer */ - error = biowait(bp); + error = bufwait(bp); bp->b_data = bp->b_saveaddr; bp->b_flags |= B_INVAL | B_AGE; bp->b_ioflags &= ~BIO_ERROR; @@ -769,7 +769,7 @@ write_volume_label(int volno) * Negotiate with phk to get it fixed. */ DEV_STRATEGY(bp, 0); - error = biowait(bp); + error = bufwait(bp); bp->b_flags |= B_INVAL | B_AGE; bp->b_ioflags &= ~BIO_ERROR; brelse(bp); diff --git a/sys/dev/vinum/vinumrevive.c b/sys/dev/vinum/vinumrevive.c index 90fa15d..315432c 100644 --- a/sys/dev/vinum/vinumrevive.c +++ b/sys/dev/vinum/vinumrevive.c @@ -173,7 +173,7 @@ revive_block(int sdno) bp->b_iocmd = BIO_READ; /* either way, read it */ bp->b_flags = 0; vinumstart(bp, 1); - biowait(bp); + bufwait(bp); } if (bp->b_ioflags & BIO_ERROR) @@ -189,7 +189,7 @@ revive_block(int sdno) bp->b_resid = bp->b_bcount; bp->b_blkno = sd->revived; /* write it to here */ sdio(bp); /* perform the I/O */ - biowait(bp); + bufwait(bp); if (bp->b_ioflags & BIO_ERROR) error = bp->b_error; else { @@ -317,7 +317,7 @@ parityops(struct vinum_ioctl_msg *data, enum parityop op) BUF_LOCKINIT(pbp); /* get a lock for the buffer */ BUF_LOCK(pbp, LK_EXCLUSIVE); /* and lock it */ sdio(pbp); /* perform the I/O */ - biowait(pbp); + bufwait(pbp); } if (reply->error == EAGAIN) { /* still OK, */ *pstripep += (pbp->b_bcount >> DEV_BSHIFT); /* moved this much further down */ @@ -444,7 +444,7 @@ parityrebuild(struct plex *plex, */ for (sdno = 0; sdno < plex->subdisks; sdno++) { /* for each subdisk */ if ((sdno != psd) || check) { - biowait(bpp[sdno]); + bufwait(bpp[sdno]); if (bpp[sdno]->b_ioflags & BIO_ERROR) /* can't read, */ error = bpp[sdno]->b_error; } @@ -541,7 +541,7 @@ initsd(int sdno, int verify) BUF_LOCK(bp, LK_EXCLUSIVE); /* and lock it */ bp->b_iocmd = BIO_WRITE; sdio(bp); /* perform the I/O */ - biowait(bp); + bufwait(bp); if (bp->b_ioflags & BIO_ERROR) error = bp->b_error; if (bp->b_qindex == 0) { /* not on a queue, */ @@ -565,7 +565,7 @@ initsd(int sdno, int verify) BUF_LOCKINIT(bp); /* get a lock for the buffer */ BUF_LOCK(bp, LK_EXCLUSIVE); /* and lock it */ sdio(bp); - biowait(bp); + bufwait(bp); /* * XXX Bug fix code. This is hopefully no * longer needed (21 February 2000). diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c index d56e005..c24f507 100644 --- a/sys/gnu/ext2fs/ext2_bmap.c +++ b/sys/gnu/ext2fs/ext2_bmap.c @@ -198,7 +198,7 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp, runb) vfs_busy_pages(bp, 0); BUF_STRATEGY(bp); curproc->p_stats->p_ru.ru_inblock++; /* XXX */ - error = biowait(bp); + error = bufwait(bp); if (error) { brelse(bp); return (error); diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c index 491858d..967dacf 100644 --- a/sys/gnu/ext2fs/ext2_inode.c +++ b/sys/gnu/ext2fs/ext2_inode.c @@ -425,7 +425,7 @@ ext2_indirtrunc(ip, lbn, dbn, lastbn, level, countp) bp->b_blkno = dbn; vfs_busy_pages(bp, 0); VOP_STRATEGY(vp, bp); - error = biowait(bp); + error = bufwait(bp); } if (error) { brelse(bp); diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c index d56e005..c24f507 100644 --- a/sys/gnu/fs/ext2fs/ext2_bmap.c +++ b/sys/gnu/fs/ext2fs/ext2_bmap.c @@ -198,7 +198,7 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp, runb) vfs_busy_pages(bp, 0); BUF_STRATEGY(bp); curproc->p_stats->p_ru.ru_inblock++; /* XXX */ - error = biowait(bp); + error = bufwait(bp); if (error) { brelse(bp); return (error); diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c index 491858d..967dacf 100644 --- a/sys/gnu/fs/ext2fs/ext2_inode.c +++ b/sys/gnu/fs/ext2fs/ext2_inode.c @@ -425,7 +425,7 @@ ext2_indirtrunc(ip, lbn, dbn, lastbn, level, countp) bp->b_blkno = dbn; vfs_busy_pages(bp, 0); VOP_STRATEGY(vp, bp); - error = biowait(bp); + error = bufwait(bp); } if (error) { brelse(bp); diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c index f3f7b98..fc7fb28 100644 --- a/sys/kern/subr_disklabel.c +++ b/sys/kern/subr_disklabel.c @@ -183,7 +183,7 @@ readdisklabel(dev, lp) bp->b_flags &= ~B_INVAL; bp->b_iocmd = BIO_READ; DEV_STRATEGY(bp, 1); - if (biowait(bp)) + if (bufwait(bp)) msg = "I/O error"; else for (dlp = (struct disklabel *)bp->b_data; dlp <= (struct disklabel *)((char *)bp->b_data + @@ -286,7 +286,7 @@ writedisklabel(dev, lp) bp->b_flags &= ~B_INVAL; bp->b_iocmd = BIO_READ; DEV_STRATEGY(bp, 1); - error = biowait(bp); + error = bufwait(bp); if (error) goto done; for (dlp = (struct disklabel *)bp->b_data; @@ -302,7 +302,7 @@ writedisklabel(dev, lp) alpha_fix_srm_checksum(bp); #endif DEV_STRATEGY(bp, 1); - error = biowait(bp); + error = bufwait(bp); goto done; } } @@ -315,7 +315,7 @@ done: bp->b_flags &= ~B_INVAL; bp->b_iocmd = BIO_WRITE; DEV_STRATEGY(bp, 1); - error = biowait(bp); + error = bufwait(bp); #endif bp->b_flags |= B_INVAL | B_AGE; brelse(bp); diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c index 0d63747..13e4387 100644 --- a/sys/kern/subr_diskmbr.c +++ b/sys/kern/subr_diskmbr.c @@ -189,7 +189,7 @@ reread_mbr: bp->b_bcount = lp->d_secsize; bp->b_iocmd = BIO_READ; DEV_STRATEGY(bp, 1); - if (biowait(bp) != 0) { + if (bufwait(bp) != 0) { diskerr(&bp->b_io, "reading primary partition table: error", LOG_PRINTF, 0, (struct disklabel *)NULL); printf("\n"); @@ -405,7 +405,7 @@ mbr_extended(dev, lp, ssp, ext_offset, ext_size, base_ext_offset, nsectors, bp->b_bcount = lp->d_secsize; bp->b_iocmd = BIO_READ; DEV_STRATEGY(bp, 1); - if (biowait(bp) != 0) { + if (bufwait(bp) != 0) { diskerr(&bp->b_io, "reading extended partition table: error", LOG_PRINTF, 0, (struct disklabel *)NULL); printf("\n"); diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 0b8c46a..7e99d18 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -473,7 +473,7 @@ bread(struct vnode * vp, daddr_t blkno, int size, struct ucred * cred, } vfs_busy_pages(bp, 0); VOP_STRATEGY(vp, bp); - return (biowait(bp)); + return (bufwait(bp)); } return (0); } @@ -538,7 +538,7 @@ breadn(struct vnode * vp, daddr_t blkno, int size, } if (readwait) { - rv = biowait(bp); + rv = bufwait(bp); } return (rv); } @@ -647,7 +647,7 @@ bwrite(struct buf * bp) BUF_STRATEGY(bp); if ((oldflags & B_ASYNC) == 0) { - int rtval = biowait(bp); + int rtval = bufwait(bp); brelse(bp); return (rtval); } diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index a19367a..caf35c4 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -292,7 +292,7 @@ single_block_read: } } if (reqbp) - return (biowait(reqbp)); + return (bufwait(reqbp)); else return (error); } diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 08437e4..edb2cbc 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -3131,7 +3131,7 @@ nfs_writebp(bp, force, procp) BUF_STRATEGY(bp); if( (oldflags & B_ASYNC) == 0) { - int rtval = biowait(bp); + int rtval = bufwait(bp); if (oldflags & B_DELWRI) { s = splbio(); diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index 08437e4..edb2cbc 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -3131,7 +3131,7 @@ nfs_writebp(bp, force, procp) BUF_STRATEGY(bp); if( (oldflags & B_ASYNC) == 0) { - int rtval = biowait(bp); + int rtval = bufwait(bp); if (oldflags & B_DELWRI) { s = splbio(); diff --git a/sys/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c index a829592..5ff899c 100644 --- a/sys/pc98/pc98/diskslice_machdep.c +++ b/sys/pc98/pc98/diskslice_machdep.c @@ -249,7 +249,7 @@ reread_mbr: bp->b_bcount = 1024; #endif DEV_STRATEGY(bp, 1); - if (biowait(bp) != 0) { + if (bufwait(bp) != 0) { diskerr(&bp->b_io, "reading primary partition table: error", LOG_PRINTF, 0, (struct disklabel *)NULL); printf("\n"); @@ -550,7 +550,7 @@ mbr_extended(dev, lp, ssp, ext_offset, ext_size, base_ext_offset, nsectors, bp->b_bcount = lp->d_secsize; bp->b_iocmd = BIO_READ; BUF_STRATEGY(bp, 1); - if (biowait(bp) != 0) { + if (bufwait(bp) != 0) { diskerr(bp, "reading extended partition table: error", LOG_PRINTF, 0, (struct disklabel *)NULL); printf("\n"); diff --git a/sys/sys/bio.h b/sys/sys/bio.h index 55a4bc1..f8073cc 100644 --- a/sys/sys/bio.h +++ b/sys/sys/bio.h @@ -579,7 +579,7 @@ struct buf *gbincore __P((struct vnode *, daddr_t)); int inmem __P((struct vnode *, daddr_t)); struct buf *getblk __P((struct vnode *, daddr_t, int, int, int)); struct buf *geteblk __P((int)); -int biowait __P((struct buf *)); +int bufwait __P((struct buf *)); void bufdone __P((struct buf *)); void biodone __P((struct bio *)); diff --git a/sys/sys/buf.h b/sys/sys/buf.h index 55a4bc1..f8073cc 100644 --- a/sys/sys/buf.h +++ b/sys/sys/buf.h @@ -579,7 +579,7 @@ struct buf *gbincore __P((struct vnode *, daddr_t)); int inmem __P((struct vnode *, daddr_t)); struct buf *getblk __P((struct vnode *, daddr_t, int, int, int)); struct buf *geteblk __P((int)); -int biowait __P((struct buf *)); +int bufwait __P((struct buf *)); void bufdone __P((struct buf *)); void biodone __P((struct bio *)); diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index 38aa03b..188278b 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -455,7 +455,7 @@ ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp) bp->b_blkno = dbn; vfs_busy_pages(bp, 0); BUF_STRATEGY(bp); - error = biowait(bp); + error = bufwait(bp); } if (error) { brelse(bp); diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index d56e005..c24f507 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -198,7 +198,7 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp, runb) vfs_busy_pages(bp, 0); BUF_STRATEGY(bp); curproc->p_stats->p_ru.ru_inblock++; /* XXX */ - error = biowait(bp); + error = bufwait(bp); if (error) { brelse(bp); return (error); diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c index f3f7b98..fc7fb28 100644 --- a/sys/ufs/ufs/ufs_disksubr.c +++ b/sys/ufs/ufs/ufs_disksubr.c @@ -183,7 +183,7 @@ readdisklabel(dev, lp) bp->b_flags &= ~B_INVAL; bp->b_iocmd = BIO_READ; DEV_STRATEGY(bp, 1); - if (biowait(bp)) + if (bufwait(bp)) msg = "I/O error"; else for (dlp = (struct disklabel *)bp->b_data; dlp <= (struct disklabel *)((char *)bp->b_data + @@ -286,7 +286,7 @@ writedisklabel(dev, lp) bp->b_flags &= ~B_INVAL; bp->b_iocmd = BIO_READ; DEV_STRATEGY(bp, 1); - error = biowait(bp); + error = bufwait(bp); if (error) goto done; for (dlp = (struct disklabel *)bp->b_data; @@ -302,7 +302,7 @@ writedisklabel(dev, lp) alpha_fix_srm_checksum(bp); #endif DEV_STRATEGY(bp, 1); - error = biowait(bp); + error = bufwait(bp); goto done; } } @@ -315,7 +315,7 @@ done: bp->b_flags &= ~B_INVAL; bp->b_iocmd = BIO_WRITE; DEV_STRATEGY(bp, 1); - error = biowait(bp); + error = bufwait(bp); #endif bp->b_flags |= B_INVAL | B_AGE; brelse(bp); |