summaryrefslogtreecommitdiff
path: root/usermux
diff options
context:
space:
mode:
authorThomas Bushnell <thomas@gnu.org>1999-07-03 23:55:56 +0000
committerThomas Bushnell <thomas@gnu.org>1999-07-03 23:55:56 +0000
commit5798491126bcb231c4fbd5a9675bae036146ad01 (patch)
tree1f38510353d3efa12978386a3990f12c993eae3f /usermux
parent99901fb5c9b4a394d25e4238eadf0677093215ee (diff)
1999-07-03 Thomas Bushnell, BSG <tb@mit.edu>
* mux.c (get_dirents): Use munmap instead of vm_deallocate. (netfs_get_dirents): Likewise.
Diffstat (limited to 'usermux')
-rw-r--r--usermux/ChangeLog5
-rw-r--r--usermux/mux.c10
2 files changed, 9 insertions, 6 deletions
diff --git a/usermux/ChangeLog b/usermux/ChangeLog
index c5d1323d..1a29b900 100644
--- a/usermux/ChangeLog
+++ b/usermux/ChangeLog
@@ -1,3 +1,8 @@
+1999-07-03 Thomas Bushnell, BSG <tb@mit.edu>
+
+ * mux.c (get_dirents): Use munmap instead of vm_deallocate.
+ (netfs_get_dirents): Likewise.
+
1999-02-28 Roland McGrath <roland@baalperazim.frob.com>
* node.c (netfs_attempt_utimes): Fix typo in last change.
diff --git a/usermux/mux.c b/usermux/mux.c
index 54468ba7..0f955544 100644
--- a/usermux/mux.c
+++ b/usermux/mux.c
@@ -1,6 +1,6 @@
/* Root usermux node
- Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.ai.mit.edu>
This file is part of the GNU Hurd.
@@ -147,14 +147,13 @@ get_dirents (struct node *dir,
}
if (err)
- vm_deallocate (mach_task_self (), (vm_address_t)*data, size);
+ munmap (*data, size);
else
{
vm_address_t alloc_end = (vm_address_t)(*data + size);
vm_address_t real_end = round_page (p);
if (alloc_end > real_end)
- vm_deallocate (mach_task_self (),
- real_end, alloc_end - real_end);
+ munmap ((caddr_t) real_end, alloc_end - real_end);
*data_len = p - *data;
*data_entries = count;
}
@@ -192,8 +191,7 @@ netfs_get_dirents (struct iouser *cred, struct node *dir,
if (cached_data_len > 0)
/* Free the old cache. */
{
- vm_deallocate (mach_task_self (),
- (vm_address_t)cached_data, cached_data_len);
+ munmap (cached_data, cached_data_len);
cached_data = 0;
cached_data_len = 0;
}