From c244d2de435ed1913d6a7da017b205bffb44b36d Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Sun, 2 Apr 2000 15:24:56 +0000 Subject: 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. --- sys/gnu/ext2fs/ext2_bmap.c | 3 ++- sys/gnu/fs/ext2fs/ext2_bmap.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'sys/gnu') diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c index 2f2a4dc44fdc..d8c61b1e76a5 100644 --- a/sys/gnu/ext2fs/ext2_bmap.c +++ b/sys/gnu/ext2fs/ext2_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/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c index 2f2a4dc44fdc..d8c61b1e76a5 100644 --- a/sys/gnu/fs/ext2fs/ext2_bmap.c +++ b/sys/gnu/fs/ext2fs/ext2_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 */ -- cgit v1.3