diff options
| author | phk <phk@FreeBSD.org> | 2000-03-20 10:44:49 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2000-03-20 10:44:49 +0000 |
| commit | a246e10f55686681d4b6bd4dba5ca661b4e34bb0 (patch) | |
| tree | 13a3ded179bf1de0aff7c33b0eba0534aa2dcf09 /sys/gnu/fs | |
| parent | f274a82c1448c090620cb35f8516831602a12658 (diff) | |
| download | FreeBSD-src-a246e10f55686681d4b6bd4dba5ca661b4e34bb0.zip FreeBSD-src-a246e10f55686681d4b6bd4dba5ca661b4e34bb0.tar.gz | |
Remove B_READ, B_WRITE and B_FREEBUF and replace them with a new
field in struct buf: b_iocmd. The b_iocmd is enforced to have
exactly one bit set.
B_WRITE was bogusly defined as zero giving rise to obvious coding
mistakes.
Also eliminate the redundant struct buf flag B_CALL, it can just
as efficiently be done by comparing b_iodone to NULL.
Should you get a panic or drop into the debugger, complaining about
"b_iocmd", don't continue. It is likely to write on your disk
where it should have been reading.
This change is a step in the direction towards a stackable BIO capability.
A lot of this patch were machine generated (Thanks to style(9) compliance!)
Vinum users: Greg has not had time to test this yet, be careful.
Diffstat (limited to 'sys/gnu/fs')
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_bmap.c | 2 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_inode.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c index 57cef46..ab5ebb5 100644 --- a/sys/gnu/fs/ext2fs/ext2_bmap.c +++ b/sys/gnu/fs/ext2fs/ext2_bmap.c @@ -192,7 +192,7 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp, runb) panic("ufs_bmaparray: indirect block not in cache"); #endif bp->b_blkno = blkptrtodb(ump, daddr); - bp->b_flags |= B_READ; + bp->b_iocmd = BIO_READ; bp->b_flags &= ~(B_INVAL|B_ERROR); vfs_busy_pages(bp, 0); VOP_STRATEGY(bp->b_vp, bp); diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c index 657f699..22847f5 100644 --- a/sys/gnu/fs/ext2fs/ext2_inode.c +++ b/sys/gnu/fs/ext2fs/ext2_inode.c @@ -37,6 +37,8 @@ * SUCH DAMAGE. * * @(#)ext2_inode.c 8.5 (Berkeley) 12/30/93 + * + * $FreeBSD$ */ #include "opt_quota.h" @@ -416,7 +418,7 @@ ext2_indirtrunc(ip, lbn, dbn, lastbn, level, countp) bp = getblk(vp, lbn, (int)fs->s_blocksize, 0, 0); if (bp->b_flags & (B_DONE | B_DELWRI)) { } else { - bp->b_flags |= B_READ; + bp->b_iocmd = BIO_READ; if (bp->b_bcount > bp->b_bufsize) panic("ext2_indirtrunc: bad buffer size"); bp->b_blkno = dbn; |
