diff options
author | phk <phk@FreeBSD.org> | 2000-04-02 15:24:56 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2000-04-02 15:24:56 +0000 |
commit | 8ee11d587fcf66a50146b00f04bb5db7b955b795 (patch) | |
tree | c184bd0e6c7538049e6b3655c28f4556a7c1a465 /sys/ufs | |
parent | 090fde9a7695bc804b6a26eb67cb706fd805231a (diff) | |
download | FreeBSD-src-8ee11d587fcf66a50146b00f04bb5db7b955b795.zip FreeBSD-src-8ee11d587fcf66a50146b00f04bb5db7b955b795.tar.gz |
Move B_ERROR flag to b_ioflags and call it BIO_ERROR.
(Much of this done by script)
Move B_ORDERED flag to b_ioflags and call it BIO_ORDERED.
Move b_pblkno and b_iodone_chain to struct bio while we transition, they
will be obsoleted once bio structs chain/stack.
Add bio_queue field for struct bio aware disksort.
Address a lot of stylistic issues brought up by bde.
Diffstat (limited to 'sys/ufs')
-rw-r--r-- | sys/ufs/ffs/ffs_inode.c | 3 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 2 | ||||
-rw-r--r-- | sys/ufs/mfs/mfs_vnops.c | 2 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_bmap.c | 3 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_disksubr.c | 2 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_vnops.c | 2 |
6 files changed, 8 insertions, 6 deletions
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index ffbe94f..4081c76 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -448,7 +448,8 @@ ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp) if ((bp->b_flags & B_CACHE) == 0) { curproc->p_stats->p_ru.ru_inblock++; /* pay for read */ bp->b_iocmd = BIO_READ; - bp->b_flags &= ~(B_ERROR|B_INVAL); + bp->b_flags &= ~B_INVAL; + bp->b_ioflags &= ~BIO_ERROR; if (bp->b_bcount > bp->b_bufsize) panic("ffs_indirtrunc: bad buffer size"); bp->b_blkno = dbn; diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 4b1c458..a6535cd 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -4667,7 +4667,7 @@ softdep_deallocate_dependencies(bp) struct buf *bp; { - if ((bp->b_flags & B_ERROR) == 0) + if ((bp->b_ioflags & BIO_ERROR) == 0) panic("softdep_deallocate_dependencies: dangling deps"); softdep_error(bp->b_vp->v_mount->mnt_stat.f_mntonname, bp->b_error); panic("softdep_deallocate_dependencies: unrecovered I/O error"); diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c index 8f00850..d1e6047 100644 --- a/sys/ufs/mfs/mfs_vnops.c +++ b/sys/ufs/mfs/mfs_vnops.c @@ -276,7 +276,7 @@ mfs_doio(bp, mfsp) bp->b_error = copyout(bp->b_data, base, bp->b_bcount); } if (bp->b_error) - bp->b_flags |= B_ERROR; + bp->b_ioflags |= BIO_ERROR; biodone(bp); } diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index 2f2a4dc..d8c61b1 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -193,7 +193,8 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp, runb) #endif bp->b_blkno = blkptrtodb(ump, daddr); bp->b_iocmd = BIO_READ; - bp->b_flags &= ~(B_INVAL|B_ERROR); + bp->b_flags &= ~B_INVAL; + bp->b_ioflags &= ~BIO_ERROR; vfs_busy_pages(bp, 0); BUF_STRATEGY(bp); curproc->p_stats->p_ru.ru_inblock++; /* XXX */ diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c index c18b984..fb2064a 100644 --- a/sys/ufs/ufs/ufs_disksubr.c +++ b/sys/ufs/ufs/ufs_disksubr.c @@ -77,7 +77,7 @@ bufqdisksort(bufq, bp) * ordered transaction, then it's easy. */ if ((bq = bufq_first(bufq)) == NULL - || (bp->b_flags & B_ORDERED) != 0) { + || (bp->b_ioflags & BIO_ORDERED) != 0) { bufq_insert_tail(bufq, bp); return; } else if (bufq->insert_point != NULL) { diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 53feec1..c2cac4a 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1764,7 +1764,7 @@ ufs_strategy(ap) error = VOP_BMAP(vp, bp->b_lblkno, NULL, &bp->b_blkno, NULL, NULL); if (error) { bp->b_error = error; - bp->b_flags |= B_ERROR; + bp->b_ioflags |= BIO_ERROR; biodone(bp); return (error); } |