summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1999-07-08 00:54:30 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1999-07-08 00:54:30 +0000
commit9da22e11b73dee1f9cccfdbdf00445679ced7f0d (patch)
treef82b989fcae49ac113ef18b9db61b88affed3c39
parent9161c1e8e3edb4989dbc80c6addfc4f38fc7192a (diff)
NFS -> NFSSERVER|NFSCLIENT
-rw-r--r--sys/uvm/uvm_swap.c10
-rw-r--r--sys/uvm/uvm_vnode.c6
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c
index c07679adabe..6c0b22c5ae3 100644
--- a/sys/uvm/uvm_swap.c
+++ b/sys/uvm/uvm_swap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_swap.c,v 1.7 1999/06/24 11:37:02 art Exp $ */
+/* $OpenBSD: uvm_swap.c,v 1.8 1999/07/08 00:54:28 deraadt Exp $ */
/* $NetBSD: uvm_swap.c,v 1.23 1998/12/26 06:25:59 marc Exp $ */
/*
@@ -825,9 +825,9 @@ swap_on(p, sdp)
#ifdef SWAP_TO_FILES
struct vattr va;
#endif
-#ifdef NFS
+#if defined(NFSSERVER) || defined(NFSCLIENT)
extern int (**nfsv2_vnodeop_p) __P((void *));
-#endif /* NFS */
+#endif /* defined(NFSSERVER) || defined(NFSCLIENT) */
dev_t dev;
char *name;
UVMHIST_FUNC("swap_on"); UVMHIST_CALLED(pdhist);
@@ -888,11 +888,11 @@ swap_on(p, sdp)
* limit the max # of outstanding I/O requests we issue
* at any one time. take it easy on NFS servers.
*/
-#ifdef NFS
+#if defined(NFSSERVER) || defined(NFSCLIENT)
if (vp->v_op == nfsv2_vnodeop_p)
sdp->swd_maxactive = 2; /* XXX */
else
-#endif /* NFS */
+#endif /* defined(NFSSERVER) || defined(NFSCLIENT) */
sdp->swd_maxactive = 8; /* XXX */
break;
#endif
diff --git a/sys/uvm/uvm_vnode.c b/sys/uvm/uvm_vnode.c
index 0632227f4c6..80eba8cb92a 100644
--- a/sys/uvm/uvm_vnode.c
+++ b/sys/uvm/uvm_vnode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_vnode.c,v 1.2 1999/02/26 05:32:08 art Exp $ */
+/* $OpenBSD: uvm_vnode.c,v 1.3 1999/07/08 00:54:29 deraadt Exp $ */
/* $NetBSD: uvm_vnode.c,v 1.18 1999/01/29 12:56:17 bouyer Exp $ */
/*
@@ -1842,7 +1842,7 @@ uvm_vnp_uncache(vp)
*/
if (!VOP_ISLOCKED(vp)) {
boolean_t is_ok_anyway = FALSE;
-#ifdef NFS
+#if defined(NFSSERVER) || defined(NFSCLIENT)
extern int (**nfsv2_vnodeop_p) __P((void *));
extern int (**spec_nfsv2nodeop_p) __P((void *));
extern int (**fifo_nfsv2nodeop_p) __P((void *));
@@ -1855,7 +1855,7 @@ uvm_vnp_uncache(vp)
if (vp->v_op == fifo_nfsv2nodeop_p) {
is_ok_anyway = TRUE;
}
-#endif /* NFS */
+#endif /* defined(NFSSERVER) || defined(NFSCLIENT) */
if (!is_ok_anyway)
panic("uvm_vnp_uncache: vnode not locked!");
}