summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nfs/ChangeLog5
-rw-r--r--nfs/ops.c4
-rw-r--r--nfs/pager.c4
3 files changed, 9 insertions, 4 deletions
diff --git a/nfs/ChangeLog b/nfs/ChangeLog
index 5099c1bf..ec32307b 100644
--- a/nfs/ChangeLog
+++ b/nfs/ChangeLog
@@ -1,3 +1,8 @@
+1999-07-03 Thomas Bushnell, BSG <tb@mit.edu>
+
+ * ops.c (netfs_get_dirents): Use munmap instead of vm_deallocate.
+ * pager.c (pager_read_page): Likewise.
+
1999-02-01 Mark Kettenis <kettenis@phys.uva.nl>
* ops.c: Include <maptime.h>.
diff --git a/nfs/ops.c b/nfs/ops.c
index 82e51fa7..5e125033 100644
--- a/nfs/ops.c
+++ b/nfs/ops.c
@@ -1694,8 +1694,8 @@ netfs_get_dirents (struct iouser *cred, struct node *np,
all the pages, free the extra. */
if (allocsize > *datacnt
&& round_page (userdp - *data) < round_page (allocsize))
- vm_deallocate (mach_task_self (), round_page (userdp),
- round_page (allocsize) - round_page (userdp - *data));
+ munmap ((caddr_t) round_page (userdp),
+ round_page (allocsize) - round_page (userdp - *data));
*datacnt = userdp - *data;
return 0;
diff --git a/nfs/pager.c b/nfs/pager.c
index be5541cf..7a333252 100644
--- a/nfs/pager.c
+++ b/nfs/pager.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
Written by Michael I. Bushnell, p/BSG.
This file is part of the GNU Hurd.
@@ -143,7 +143,7 @@ pager_read_page (struct user_pager_info *pager,
{
mutex_unlock (&np->lock);
free (rpcbuf);
- vm_deallocate (mach_task_self (), *buf, vm_page_size);
+ munmap ((caddr_t) *buf, vm_page_size);
return err;
}