summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorConstantine Sapuntzakis <csapuntz@cvs.openbsd.org>2001-02-28 20:32:41 +0000
committerConstantine Sapuntzakis <csapuntz@cvs.openbsd.org>2001-02-28 20:32:41 +0000
commit5c0183285f3c19c52b96d2c98103bf0f1f3c4c6b (patch)
treed05d5a2407f98a581a0246a49f8c24acae6baa34 /sys
parent89cf79a7a9a5cafb8ddfb67afb415294cd6b8062 (diff)
Get rid of VHOLD, replace with buf_replacevnode.
Diffstat (limited to 'sys')
-rw-r--r--sys/vm/swap_pager.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index dd1c8b6f717..f7ee9045449 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swap_pager.c,v 1.16 1999/05/22 21:22:34 weingart Exp $ */
+/* $OpenBSD: swap_pager.c,v 1.17 2001/02/28 20:32:40 csapuntz Exp $ */
/* $NetBSD: swap_pager.c,v 1.27 1996/03/16 23:15:20 christos Exp $ */
/*
@@ -702,10 +702,8 @@ swap_pager_io(swp, mlist, npages, flags)
bp->b_proc = &proc0; /* XXX (but without B_PHYS set this is ok) */
bp->b_data = (caddr_t)kva;
bp->b_blkno = swb->swb_block + btodb(off);
- VHOLD(swapdev_vp);
- bp->b_vp = swapdev_vp;
- if (swapdev_vp->v_type == VBLK)
- bp->b_dev = swapdev_vp->v_rdev;
+ bp->b_vp = 0;
+ buf_replacevnode(bp, swapdev_vp);
bp->b_bcount = npages * PAGE_SIZE;
/*
@@ -716,7 +714,6 @@ swap_pager_io(swp, mlist, npages, flags)
bp->b_dirtyoff = 0;
bp->b_dirtyend = npages * PAGE_SIZE;
s = splbio();
- swapdev_vp->v_numoutput++;
swp->sw_poip++;
splx(s);
mask = (~(~0 << npages)) << atop(off);