diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-05-09 03:48:59 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-05-09 03:48:59 +0000 |
| commit | e8aaaad468ea7451f2f8da0459793aa3606690f1 (patch) | |
| tree | 0ebb82e6111aae1390d8da518f0e068411a3066e | |
| parent | d4524faf39df32375f13834ddea2b156bc85f84e (diff) | |
disable IO_NOCACHE B_NOCACHE conversion until it works.
| -rw-r--r-- | sys/msdosfs/msdosfs_vnops.c | 4 | ||||
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_readwrite.c | 4 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_vnops.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index ef78d3ec5ce..482f1ee94e7 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_vnops.c,v 1.92 2014/04/08 18:48:41 beck Exp $ */ +/* $OpenBSD: msdosfs_vnops.c,v 1.93 2014/05/09 03:48:58 tedu Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $ */ /*- @@ -743,8 +743,10 @@ msdosfs_write(void *v) * without delay. Otherwise do a delayed write because we * may want to write somemore into the block later. */ +#if 0 if (ioflag & IO_NOCACHE) bp->b_flags |= B_NOCACHE; +#endif if (ioflag & IO_SYNC) (void) bwrite(bp); else if (n + croffset == pmp->pm_bpcluster) diff --git a/sys/ufs/ext2fs/ext2fs_readwrite.c b/sys/ufs/ext2fs/ext2fs_readwrite.c index 152674892e8..e8029ac7ac2 100644 --- a/sys/ufs/ext2fs/ext2fs_readwrite.c +++ b/sys/ufs/ext2fs/ext2fs_readwrite.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_readwrite.c,v 1.28 2014/04/08 18:48:41 beck Exp $ */ +/* $OpenBSD: ext2fs_readwrite.c,v 1.29 2014/05/09 03:48:58 tedu Exp $ */ /* $NetBSD: ext2fs_readwrite.c,v 1.16 2001/02/27 04:37:47 chs Exp $ */ /*- @@ -245,8 +245,10 @@ ext2fs_write(void *v) error = uiomove((char *)bp->b_data + blkoffset, (int)xfersize, uio); +#if 0 if (ioflag & IO_NOCACHE) bp->b_flags |= B_NOCACHE; +#endif if (ioflag & IO_SYNC) (void)bwrite(bp); else if (xfersize + blkoffset == fs->e2fs_bsize) { diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index e25efadc5c5..292b079a077 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vnops.c,v 1.74 2014/04/08 18:48:41 beck Exp $ */ +/* $OpenBSD: ffs_vnops.c,v 1.75 2014/05/09 03:48:58 tedu Exp $ */ /* $NetBSD: ffs_vnops.c,v 1.7 1996/05/11 18:27:24 mycroft Exp $ */ /* @@ -378,8 +378,10 @@ ffs_write(void *v) if (error != 0) memset(bp->b_data + blkoffset, 0, xfersize); +#if 0 if (ioflag & IO_NOCACHE) bp->b_flags |= B_NOCACHE; +#endif if (ioflag & IO_SYNC) (void)bwrite(bp); else if (xfersize + blkoffset == fs->fs_bsize) { |