summaryrefslogtreecommitdiff
path: root/sys/nfs/nfs_vnops.c
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2009-06-06 18:06:23 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2009-06-06 18:06:23 +0000
commite2b3079a9a2517a38b09f5f5122129e1f694dc8e (patch)
tree1bf93144b74c5ed6f6771088b014c23c8c0afdac /sys/nfs/nfs_vnops.c
parent34fe98751844589de34ce4f031ccea5ab9f2db10 (diff)
All caller of buf_acquire were doing bremfree before the call.
Just put it in the buf_acquire function. oga@ ok
Diffstat (limited to 'sys/nfs/nfs_vnops.c')
-rw-r--r--sys/nfs/nfs_vnops.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 67eedde4fc1..2fe5acffd29 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_vnops.c,v 1.113 2009/06/04 00:31:42 blambert Exp $ */
+/* $OpenBSD: nfs_vnops.c,v 1.114 2009/06/06 18:06:22 art Exp $ */
/* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */
/*
@@ -2827,7 +2827,6 @@ again:
if ((bp->b_flags & (B_BUSY | B_DELWRI | B_NEEDCOMMIT))
!= (B_DELWRI | B_NEEDCOMMIT))
continue;
- bremfree(bp);
bp->b_flags |= B_WRITEINPROG;
buf_acquire(bp);
/*
@@ -2906,7 +2905,6 @@ loop:
panic("nfs_fsync: not dirty");
if ((passone || !commit) && (bp->b_flags & B_NEEDCOMMIT))
continue;
- bremfree(bp);
if (passone || !commit) {
bp->b_flags |= B_ASYNC;
} else {