diff options
| author | mckusick <mckusick@FreeBSD.org> | 1999-06-16 23:27:55 +0000 |
|---|---|---|
| committer | mckusick <mckusick@FreeBSD.org> | 1999-06-16 23:27:55 +0000 |
| commit | 88e39a63db386a8e7939538fd1b350cbe663486b (patch) | |
| tree | 002e7a32883a2178dd2164b02c296d429dee5cfd /sys/nfs | |
| parent | 97a0215ac1c4c057e39723365f18d612e9304581 (diff) | |
| download | FreeBSD-src-88e39a63db386a8e7939538fd1b350cbe663486b.zip FreeBSD-src-88e39a63db386a8e7939538fd1b350cbe663486b.tar.gz | |
Add a vnode argument to VOP_BWRITE to get rid of the last vnode
operator special case. Delete special case code from vnode_if.sh,
vnode_if.src, umap_vnops.c, and null_vnops.c.
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_bio.c | 6 | ||||
| -rw-r--r-- | sys/nfs/nfs_vnops.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index c7029d6..fe055c0 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95 - * $Id: nfs_bio.c,v 1.71 1999/05/06 20:00:30 phk Exp $ + * $Id: nfs_bio.c,v 1.72 1999/06/05 05:25:37 peter Exp $ */ @@ -894,7 +894,7 @@ again: if (bp->b_dirtyend > 0 && (on > bp->b_dirtyend || (on + n) < bp->b_dirtyoff)) { - if (VOP_BWRITE(bp) == EINTR) + if (VOP_BWRITE(bp->b_vp, bp) == EINTR) return (EINTR); goto again; } @@ -961,7 +961,7 @@ again: if ((np->n_flag & NQNFSNONCACHE) || (ioflag & IO_SYNC)) { if (ioflag & IO_INVAL) bp->b_flags |= B_NOCACHE; - error = VOP_BWRITE(bp); + error = VOP_BWRITE(bp->b_vp, bp); if (error) return (error); if (np->n_flag & NQNFSNONCACHE) { diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 1450102..c4b20b8 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95 - * $Id: nfs_vnops.c,v 1.129 1999/05/11 19:54:47 phk Exp $ + * $Id: nfs_vnops.c,v 1.130 1999/06/05 05:35:02 peter Exp $ */ @@ -2933,7 +2933,7 @@ loop: else bp->b_flags |= (B_BUSY|B_ASYNC|B_WRITEINPROG|B_NEEDCOMMIT); splx(s); - VOP_BWRITE(bp); + VOP_BWRITE(bp->b_vp, bp); goto loop; } splx(s); |
