From 986066d06508cb85fbf57ef7f4cc2373897b0a4d Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Fri, 22 Feb 2002 09:03:00 +0000
Subject: [PATCH] Replace bowrite() with BUF_WRITE in ufs.

Remove bowrite(), it is now unused.

This is the first step in getting entirely rid of BIO_ORDERED which is
a generally accepted evil thing.

Approved by:	mckusick
---
 sys/kern/vfs_bio.c       | 16 ----------------
 sys/sys/buf.h            |  1 -
 sys/ufs/ufs/ufs_lookup.c |  6 +++---
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 1ca27abf4e8f..386d1dd8d72a 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -989,22 +989,6 @@ bawrite(struct buf * bp)
 	(void) BUF_WRITE(bp);
 }
 
-/*
- *	bowrite:
- *
- *	Ordered write.  Start output on a buffer, and flag it so that the 
- *	device will write it in the order it was queued.  The buffer is 
- *	released when the output completes.  bwrite() ( or the VOP routine
- *	anyway ) is responsible for handling B_INVAL buffers.
- */
-int
-bowrite(struct buf * bp)
-{
-	bp->b_ioflags |= BIO_ORDERED;
-	bp->b_flags |= B_ASYNC;
-	return (BUF_WRITE(bp));
-}
-
 /*
  *	bwillwrite:
  *
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 61fda6c726a1..b6c367cd0090 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -487,7 +487,6 @@ void	bdwrite __P((struct buf *));
 void	bawrite __P((struct buf *));
 void	bdirty __P((struct buf *));
 void	bundirty __P((struct buf *));
-int	bowrite __P((struct buf *));
 void	brelse __P((struct buf *));
 void	bqrelse __P((struct buf *));
 int	vfs_bio_awrite __P((struct buf *));
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index da1c0e933ab6..ee7df3d93212 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -953,7 +953,7 @@ ufs_direnter(dvp, tvp, dirp, cnp, newdirbp)
 			bdwrite(bp);
 			error = 0;
 		} else {
-			error = bowrite(bp);
+			error = BUF_WRITE(bp);
 		}
 	}
 	dp->i_flag |= IN_CHANGE | IN_UPDATE;
@@ -1070,7 +1070,7 @@ out:
 			bdwrite(bp);
 			error = 0;
 		} else
-			error = bowrite(bp);
+			error = BUF_WRITE(bp);
 	}
 	dp->i_flag |= IN_CHANGE | IN_UPDATE;
 	/*
@@ -1120,7 +1120,7 @@ ufs_dirrewrite(dp, oip, newinum, newtype, isrmdir)
 			bdwrite(bp);
 			error = 0;
 		} else {
-			error = bowrite(bp);
+			error = BUF_WRITE(bp);
 		}
 	}
 	dp->i_flag |= IN_CHANGE | IN_UPDATE;