diff options
author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2010-12-21 20:14:45 +0000 |
---|---|---|
committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2010-12-21 20:14:45 +0000 |
commit | 533610cd3b12c41762f0fbaa058c868cc1458b45 (patch) | |
tree | 866b788e63499fb184820ccec149d0e2c6d410bb /sys/uvm | |
parent | b8f93236e139a325a6aec2b47b12ecbfab8aaf99 (diff) |
Bring back the "End the VOP experiment." diff, naddy's issues where
unrelated, and his alpha is much happier now.
OK deraadt@
Diffstat (limited to 'sys/uvm')
-rw-r--r-- | sys/uvm/uvm_swap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c index 7a30c02d79a..3a93811ea88 100644 --- a/sys/uvm/uvm_swap.c +++ b/sys/uvm/uvm_swap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_swap.c,v 1.99 2010/12/04 05:18:10 jsing Exp $ */ +/* $OpenBSD: uvm_swap.c,v 1.100 2010/12/21 20:14:44 thib Exp $ */ /* $NetBSD: uvm_swap.c,v 1.40 2000/11/17 11:39:39 mrg Exp $ */ /* @@ -898,7 +898,7 @@ swap_on(struct proc *p, struct swapdev *sdp) long addr; struct vattr va; #if defined(NFSCLIENT) - extern int (**nfsv2_vnodeop_p)(void *); + extern struct vops nfs_vops; #endif /* defined(NFSCLIENT) */ dev_t dev; UVMHIST_FUNC("swap_on"); UVMHIST_CALLED(pdhist); @@ -959,7 +959,7 @@ swap_on(struct proc *p, struct swapdev *sdp) * at any one time. take it easy on NFS servers. */ #if defined(NFSCLIENT) - if (vp->v_op == nfsv2_vnodeop_p) + if (vp->v_op == &nfs_vops) sdp->swd_maxactive = 2; /* XXX */ else #endif /* defined(NFSCLIENT) */ |