summaryrefslogtreecommitdiffstats
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authorbeck <beck@openbsd.org>2008-07-23 16:24:42 +0000
committerbeck <beck@openbsd.org>2008-07-23 16:24:42 +0000
commitc77a6aac71fe7811e361a79ab6dc41841b9f5c43 (patch)
treec7640aeabb4d2d639a225dc03aba5e96cd191e51 /sys/dev/raidframe
parentPrevent warning about insecure hostnames where no /etc/hostname.* (diff)
downloadwireguard-openbsd-c77a6aac71fe7811e361a79ab6dc41841b9f5c43.tar.xz
wireguard-openbsd-c77a6aac71fe7811e361a79ab6dc41841b9f5c43.zip
Correct cases of mishandling of pending reads and writes to prevent
them going negative - this consists of identifying a number of cases of IO not going through the buffer cache and marking those buffers with B_RAW - as well as fixing nfs_bio to show pending writes and reads through the buffer cache via NFS still has a problem with mishandling the counters I believe in the async/sync fallback case where counters stay positive which will be addressed seperately. ok tedu@ deraadt@
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_openbsdkintf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/raidframe/rf_openbsdkintf.c b/sys/dev/raidframe/rf_openbsdkintf.c
index 46f9f9b8054..cac048abce7 100644
--- a/sys/dev/raidframe/rf_openbsdkintf.c
+++ b/sys/dev/raidframe/rf_openbsdkintf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rf_openbsdkintf.c,v 1.49 2008/06/26 05:42:17 ray Exp $ */
+/* $OpenBSD: rf_openbsdkintf.c,v 1.50 2008/07/23 16:24:43 beck Exp $ */
/* $NetBSD: rf_netbsdkintf.c,v 1.109 2001/07/27 03:30:07 oster Exp $ */
/*-
@@ -2285,7 +2285,7 @@ raidread_component_label(dev_t dev, struct vnode *b_vp,
/* Get our ducks in a row for the read. */
bp->b_blkno = RF_COMPONENT_INFO_OFFSET / DEV_BSIZE;
bp->b_bcount = RF_COMPONENT_INFO_SIZE;
- bp->b_flags |= B_READ;
+ bp->b_flags |= (B_READ | B_RAW);
bp->b_resid = RF_COMPONENT_INFO_SIZE / DEV_BSIZE;
(*bdevsw[major(bp->b_dev)].d_strategy)(bp);
@@ -2320,7 +2320,7 @@ raidwrite_component_label(dev_t dev, struct vnode *b_vp,
/* Get our ducks in a row for the write. */
bp->b_blkno = RF_COMPONENT_INFO_OFFSET / DEV_BSIZE;
bp->b_bcount = RF_COMPONENT_INFO_SIZE;
- bp->b_flags |= B_WRITE;
+ bp->b_flags |= (B_WRITE | B_RAW);
bp->b_resid = RF_COMPONENT_INFO_SIZE / DEV_BSIZE;
memset(bp->b_data, 0, RF_COMPONENT_INFO_SIZE );