diff options
| -rw-r--r-- | sys/kern/kern_physio.c | 2 | ||||
| -rw-r--r-- | sys/kern/vfs_aio.c | 1 | ||||
| -rw-r--r-- | sys/kern/vfs_bio.c | 9 | ||||
| -rw-r--r-- | sys/sys/buf.h | 2 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_rawread.c | 2 |
5 files changed, 3 insertions, 13 deletions
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c index 6d93816..83b7b82 100644 --- a/sys/kern/kern_physio.c +++ b/sys/kern/kern_physio.c @@ -59,7 +59,7 @@ physio(dev_t dev, struct uio *uio, int ioflag) for (i = 0; i < uio->uio_iovcnt; i++) { while (uio->uio_iov[i].iov_len) { - bp->b_flags = B_PHYS; + bp->b_flags = 0; if (uio->uio_rw == UIO_READ) bp->b_iocmd = BIO_READ; else diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 6642fde..d51d3fc 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -1102,7 +1102,6 @@ aio_qphysio(struct proc *p, struct aiocblist *aiocbe) bp->b_bcount = cb->aio_nbytes; bp->b_bufsize = cb->aio_nbytes; - bp->b_flags = B_PHYS; bp->b_iodone = aio_physwakeup; bp->b_saveaddr = bp->b_data; bp->b_data = (void *)(uintptr_t)cb->aio_buf; diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 6fea80b..83eca08 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -3074,15 +3074,6 @@ dev_strategy(struct buf *bp) if ((!bp->b_iocmd) || (bp->b_iocmd & (bp->b_iocmd - 1))) panic("b_iocmd botch"); - if (bp->b_flags & B_PHYS) - KASSERT(bp->b_io.bio_offset == bp->b_offset, - ("bio_offset %jd wrong, should be %jd", - (intmax_t)bp->b_io.bio_offset, (intmax_t)bp->b_offset)); - else - KASSERT(bp->b_io.bio_offset == dbtob(bp->b_blkno), - ("bio_offset %jd wrong, should be %jd", - (intmax_t)bp->b_io.bio_offset, - (intmax_t)dbtob(bp->b_blkno))); bp->b_io.bio_done = bufdonebio; bp->b_io.bio_caller2 = bp; (*devsw(bp->b_io.bio_dev)->d_strategy)(&bp->b_io); diff --git a/sys/sys/buf.h b/sys/sys/buf.h index 500443f..ca17978 100644 --- a/sys/sys/buf.h +++ b/sys/sys/buf.h @@ -218,7 +218,7 @@ struct buf { #define B_NOCACHE 0x00008000 /* Do not cache block after use. */ #define B_MALLOC 0x00010000 /* malloced b_data */ #define B_CLUSTEROK 0x00020000 /* Pagein op, so swap() can count it. */ -#define B_PHYS 0x00040000 /* I/O to user memory. */ +#define B_000400000 0x00040000 /* Available flag. */ #define B_000800000 0x00080000 /* Available flag. */ #define B_00100000 0x00100000 /* Available flag. */ #define B_DIRTY 0x00200000 /* Needs writing later (in EXT2FS). */ diff --git a/sys/ufs/ffs/ffs_rawread.c b/sys/ufs/ffs/ffs_rawread.c index b6fc927..3dcb33e 100644 --- a/sys/ufs/ffs/ffs_rawread.c +++ b/sys/ufs/ffs/ffs_rawread.c @@ -209,7 +209,7 @@ ffs_rawread_readahead(struct vnode *vp, if (iolen != 0) bp->b_bcount -= PAGE_SIZE; } - bp->b_flags = B_PHYS; + bp->b_flags = 0; /* XXX necessary ? */ bp->b_iocmd = BIO_READ; bp->b_iodone = ffs_rawreadwakeup; bp->b_data = udata; |
