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/nfs | |
| 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/nfs')
| -rw-r--r-- | sys/nfs/nfs_bio.c | 7 | ||||
| -rw-r--r-- | sys/nfs/nfs_vnops.c | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index 929152321e0..70e6e3fc398 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_bio.c,v 1.51 2008/06/14 19:33:58 beck Exp $ */ +/* $OpenBSD: nfs_bio.c,v 1.52 2008/07/23 16:24:43 beck Exp $ */ /* $NetBSD: nfs_bio.c,v 1.25.4.2 1996/07/08 20:47:04 jtc Exp $ */ /* @@ -607,11 +607,13 @@ nfs_doio(bp, p) if (bp->b_flags & B_READ) { uiop->uio_rw = UIO_READ; nfsstats.read_physios++; + bcstats.pendingreads++; /* XXX */ error = nfs_readrpc(vp, uiop); } else { iomode = NFSV3WRITE_DATASYNC; uiop->uio_rw = UIO_WRITE; nfsstats.write_physios++; + bcstats.pendingwrites++; /* XXX */ error = nfs_writerpc(vp, uiop, &iomode, &must_commit); } if (error) { @@ -626,6 +628,7 @@ nfs_doio(bp, p) case VREG: uiop->uio_offset = ((off_t)bp->b_blkno) << DEV_BSHIFT; nfsstats.read_bios++; + bcstats.pendingreads++; error = nfs_readrpc(vp, uiop); if (!error) { bp->b_validoff = 0; @@ -657,6 +660,7 @@ nfs_doio(bp, p) case VLNK: uiop->uio_offset = (off_t)0; nfsstats.readlink_bios++; + bcstats.pendingreads++; /* XXX */ error = nfs_readlinkrpc(vp, uiop, curproc->p_ucred); break; default: @@ -675,6 +679,7 @@ nfs_doio(bp, p) io.iov_base = (char *)bp->b_data + bp->b_dirtyoff; uiop->uio_rw = UIO_WRITE; nfsstats.write_bios++; + bcstats.pendingwrites++; /* XXX */ if ((bp->b_flags & (B_ASYNC | B_NEEDCOMMIT | B_NOCACHE)) == B_ASYNC) iomode = NFSV3WRITE_UNSTABLE; else diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 2741ca34473..bc1e604c86a 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vnops.c,v 1.95 2008/07/23 11:53:07 art Exp $ */ +/* $OpenBSD: nfs_vnops.c,v 1.96 2008/07/23 16:24:43 beck Exp $ */ /* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */ /* @@ -2997,6 +2997,7 @@ nfs_writebp(bp, force) } if( (oldflags & B_ASYNC) == 0) { + bp->b_flags |= B_RAW; int rtval = biowait(bp); if (!(oldflags & B_DELWRI) && p) { ++p->p_stats->p_ru.ru_oublock; |