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 /contrib/sys | |
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 'contrib/sys')
-rw-r--r-- | contrib/sys/softupdates/ffs_softdep.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/contrib/sys/softupdates/ffs_softdep.c b/contrib/sys/softupdates/ffs_softdep.c index 8521e3b..df2791f 100644 --- a/contrib/sys/softupdates/ffs_softdep.c +++ b/contrib/sys/softupdates/ffs_softdep.c @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * from: @(#)ffs_softdep.c 9.40 (McKusick) 6/15/99 - * $Id: ffs_softdep.c,v 1.29 1999/05/22 04:43:04 julian Exp $ + * $Id: ffs_softdep.c,v 1.30 1999/06/15 23:37:29 mckusick Exp $ */ /* @@ -3533,7 +3533,8 @@ softdep_update_inodeblock(ip, bp, waitfor) } gotit = getdirtybuf(&inodedep->id_buf, MNT_WAIT); FREE_LOCK(&lk); - if (gotit && (error = VOP_BWRITE(inodedep->id_buf)) != 0) + if (gotit && + (error = VOP_BWRITE(inodedep->id_buf->b_vp, inodedep->id_buf)) != 0) softdep_error("softdep_update_inodeblock: bwrite", error); if ((inodedep->id_state & DEPCOMPLETE) == 0) panic("softdep_update_inodeblock: update failed"); @@ -3666,7 +3667,7 @@ softdep_fsync(vp) */ error = bread(pvp, lbn, blksize(fs, VTOI(pvp), lbn), p->p_ucred, &bp); - ret = VOP_BWRITE(bp); + ret = VOP_BWRITE(bp->b_vp, bp); vput(pvp); if (error != 0) return (error); @@ -3808,7 +3809,7 @@ loop: FREE_LOCK(&lk); if (waitfor == MNT_NOWAIT) { bawrite(nbp); - } else if ((error = VOP_BWRITE(nbp)) != 0) { + } else if ((error = VOP_BWRITE(nbp->b_vp, nbp)) != 0) { bawrite(bp); return (error); } @@ -3825,7 +3826,7 @@ loop: FREE_LOCK(&lk); if (waitfor == MNT_NOWAIT) { bawrite(nbp); - } else if ((error = VOP_BWRITE(nbp)) != 0) { + } else if ((error = VOP_BWRITE(nbp->b_vp, nbp)) != 0) { bawrite(bp); return (error); } @@ -3842,7 +3843,7 @@ loop: if (getdirtybuf(&nbp, MNT_WAIT) == 0) goto restart; FREE_LOCK(&lk); - if ((error = VOP_BWRITE(nbp)) != 0) { + if ((error = VOP_BWRITE(nbp->b_vp, nbp)) != 0) { bawrite(bp); return (error); } @@ -3896,7 +3897,7 @@ loop: FREE_LOCK(&lk); if (waitfor == MNT_NOWAIT) { bawrite(nbp); - } else if ((error = VOP_BWRITE(nbp)) != 0) { + } else if ((error = VOP_BWRITE(nbp->b_vp, nbp)) != 0) { bawrite(bp); return (error); } @@ -3917,7 +3918,7 @@ loop: FREE_LOCK(&lk); if (waitfor == MNT_NOWAIT) { bawrite(nbp); - } else if ((error = VOP_BWRITE(nbp)) != 0) { + } else if ((error = VOP_BWRITE(nbp->b_vp, nbp)) != 0) { bawrite(bp); return (error); } @@ -4027,7 +4028,7 @@ flush_inodedep_deps(fs, ino) FREE_LOCK(&lk); if (waitfor == MNT_NOWAIT) { bawrite(bp); - } else if ((error = VOP_BWRITE(bp)) != 0) { + } else if ((error = VOP_BWRITE(bp->b_vp, bp)) != 0) { ACQUIRE_LOCK(&lk); return (error); } @@ -4049,7 +4050,7 @@ flush_inodedep_deps(fs, ino) FREE_LOCK(&lk); if (waitfor == MNT_NOWAIT) { bawrite(bp); - } else if ((error = VOP_BWRITE(bp)) != 0) { + } else if ((error = VOP_BWRITE(bp->b_vp, bp)) != 0) { ACQUIRE_LOCK(&lk); return (error); } @@ -4136,7 +4137,8 @@ flush_pagedep_deps(pvp, mp, diraddhdp) gotit = getdirtybuf(&inodedep->id_buf,MNT_WAIT); FREE_LOCK(&lk); if (gotit && - (error = VOP_BWRITE(inodedep->id_buf)) != 0) + (error = VOP_BWRITE(inodedep->id_buf->b_vp, + inodedep->id_buf)) != 0) break; ACQUIRE_LOCK(&lk); } @@ -4151,7 +4153,7 @@ flush_pagedep_deps(pvp, mp, diraddhdp) fsbtodb(ump->um_fs, ino_to_fsba(ump->um_fs, inum)), (int)ump->um_fs->fs_bsize, NOCRED, &bp)) != 0) break; - if ((error = VOP_BWRITE(bp)) != 0) + if ((error = VOP_BWRITE(bp->b_vp, bp)) != 0) break; ACQUIRE_LOCK(&lk); if (dap == LIST_FIRST(diraddhdp)) |