diff options
| -rw-r--r-- | libnetfs/ChangeLog | 6 | ||||
| -rw-r--r-- | libnetfs/io-read.c | 9 | ||||
| -rw-r--r-- | libnetfs/release-protid.c | 5 |
3 files changed, 12 insertions, 8 deletions
diff --git a/libnetfs/ChangeLog b/libnetfs/ChangeLog index ae25f1d8..74f6c5f0 100644 --- a/libnetfs/ChangeLog +++ b/libnetfs/ChangeLog @@ -1,3 +1,9 @@ +1999-07-03 Thomas Bushnell, BSG <tb@mit.edu> + + * io-read.c (netfs_S_io_read): Use munmap instead of + vm_deallocate. + * release-protid.c (netfs_release_protid): Likewise. + 1999-07-01 Thomas Bushnell, BSG <tb@mit.edu> * nref.c: New file; guts from netfs.h. diff --git a/libnetfs/io-read.c b/libnetfs/io-read.c index 7603a9d8..00452d30 100644 --- a/libnetfs/io-read.c +++ b/libnetfs/io-read.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. @@ -93,12 +93,11 @@ netfs_S_io_read (struct protid *user, mutex_unlock (&node->lock); if (err && alloced) - vm_deallocate (mach_task_self (), (vm_address_t) *data, amount); + munmap (*data, amount); if (!err && alloced && (round_page (*datalen) < round_page (amount))) - vm_deallocate (mach_task_self (), - (vm_address_t) *data + round_page (*datalen), - round_page (amount) - round_page (*datalen)); + munmap (*data + round_page (*datalen), + round_page (amount) - round_page (*datalen)); return err; } diff --git a/libnetfs/release-protid.c b/libnetfs/release-protid.c index 6654123e..d423b2b6 100644 --- a/libnetfs/release-protid.c +++ b/libnetfs/release-protid.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 1999 Free Software Foundation, Inc. Written by Michael I. Bushnell, p/BSG. This file is part of the GNU Hurd. @@ -29,7 +29,6 @@ netfs_release_protid (void *arg) if (user->shared_object) mach_port_deallocate (mach_task_self (), user->shared_object); if (user->mapped) - vm_deallocate (mach_task_self (), (vm_address_t) user->mapped, - vm_page_size); + munmap (user->mapped, vm_page_size); netfs_release_peropen (user->po); } |