diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2008-07-23 16:24:44 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2008-07-23 16:24:44 +0000 |
| commit | 23e70fc50082547972f5818951c8059631e3dcd4 (patch) | |
| tree | 9b67c0056c4c4fa54580f878d631585702c0dc01 /sys/dev | |
| parent | e77c07a231c41171438be828e97f655a4996f8b8 (diff) | |
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')
| -rw-r--r-- | sys/dev/raidframe/rf_openbsdkintf.c | 6 | ||||
| -rw-r--r-- | sys/dev/vnd.c | 4 |
2 files changed, 6 insertions, 4 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 ); diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c index 85be177912d..602f56f2006 100644 --- a/sys/dev/vnd.c +++ b/sys/dev/vnd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vnd.c,v 1.87 2008/07/20 01:53:43 krw Exp $ */ +/* $OpenBSD: vnd.c,v 1.88 2008/07/23 16:24:43 beck Exp $ */ /* $NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $ */ /* @@ -652,6 +652,8 @@ vndiodone(struct buf *bp) vbp->vb_buf.b_error); pbp->b_flags |= B_ERROR; + /* XXX does this matter here? */ + (&vbp->vb_buf)->b_flags |= B_RAW; pbp->b_error = biowait(&vbp->vb_buf); } pbp->b_resid -= vbp->vb_buf.b_bcount; |