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.

3 files changed, 20 insertions, 18 deletions

diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 8521e3b2adf9..df2791f99d42 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/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))
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index 44d33a8826fa..dbbfefbc3f97 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lookup.c	8.15 (Berkeley) 6/16/95
- * $Id: ufs_lookup.c,v 1.26 1999/01/07 16:14:18 bde Exp $
+ * $Id: ufs_lookup.c,v 1.27 1999/01/28 00:57:56 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -719,7 +719,7 @@ ufs_direnter(dvp, tvp, dirp, cnp, newdirbp)
 			    dirp->d_ino, newdirbp);
 			bdwrite(bp);
 		} else {
-			error = VOP_BWRITE(bp);
+			error = VOP_BWRITE(bp->b_vp, bp);
 		}
 		ret = UFS_UPDATE(dvp, !DOINGSOFTDEP(dvp));
 		if (error == 0)
@@ -896,7 +896,7 @@ out:
 		if (ip)
 			ip->i_nlink--;
 		if (flags & DOWHITEOUT)
-			error = VOP_BWRITE(bp);
+			error = VOP_BWRITE(bp->b_vp, bp);
 		else if (dvp->v_mount->mnt_flag & MNT_ASYNC
 		    && dp->i_count != 0) {
 			bdwrite(bp);
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 52b3ab6c737d..3526115ebfe3 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vnops.c	8.27 (Berkeley) 5/27/95
- * $Id: ufs_vnops.c,v 1.113 1999/04/28 11:38:20 phk Exp $
+ * $Id: ufs_vnops.c,v 1.114 1999/05/11 19:55:05 phk Exp $
  */
 
 #include "opt_quota.h"
@@ -1421,7 +1421,7 @@ ufs_mkdir(ap)
 		}
 	}
 	if ((error = UFS_UPDATE(tvp, !DOINGSOFTDEP(tvp))) != 0) {
-		(void)VOP_BWRITE(bp);
+		(void)VOP_BWRITE(bp->b_vp, bp);
 		goto bad;
 	}
 	VN_POLLEVENT(dvp, POLLWRITE); /* XXX right place? */
@@ -1436,7 +1436,7 @@ ufs_mkdir(ap)
 	 * an appropriate ordering dependency to the buffer which ensures that
 	 * the buffer is written before the new name is written in the parent.
 	 */
-	if (!DOINGSOFTDEP(dvp) && ((error = VOP_BWRITE(bp)) != 0))
+	if (!DOINGSOFTDEP(dvp) && ((error = VOP_BWRITE(bp->b_vp, bp)) != 0))
 		goto bad;
 	ufs_makedirentry(ip, cnp, &newdir);
 	error = ufs_direnter(dvp, tvp, &newdir, cnp, bp);