diff options
author | phk <phk@FreeBSD.org> | 2002-02-22 09:03:00 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2002-02-22 09:03:00 +0000 |
commit | 62d248fb9eb6f0b6dc7d6c7832ef5206f47d0f34 (patch) | |
tree | fb3c809509832050d51481f376c5db77b79b940c | |
parent | 921e42206aa3611a5a583b7df2a4e94e01a516b9 (diff) | |
download | FreeBSD-src-62d248fb9eb6f0b6dc7d6c7832ef5206f47d0f34.zip FreeBSD-src-62d248fb9eb6f0b6dc7d6c7832ef5206f47d0f34.tar.gz |
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
-rw-r--r-- | sys/kern/vfs_bio.c | 16 | ||||
-rw-r--r-- | sys/sys/buf.h | 1 | ||||
-rw-r--r-- | 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 1ca27ab..386d1dd 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -990,22 +990,6 @@ bawrite(struct buf * 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: * * Called prior to the locking of any vnodes when we are expecting to diff --git a/sys/sys/buf.h b/sys/sys/buf.h index 61fda6c..b6c367c 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 da1c0e9..ee7df3d 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; |