summaryrefslogtreecommitdiff
path: root/libdiskfs
diff options
context:
space:
mode:
authorThomas Bushnell <thomas@gnu.org>1999-07-03 23:50:16 +0000
committerThomas Bushnell <thomas@gnu.org>1999-07-03 23:50:16 +0000
commitebbe233e5686d50ad90cb6131d49fd94519d86fb (patch)
treee9dd5dcf7ea4b49983fab18df3f11f672620b3d2 /libdiskfs
parentf51cf6ff2a01cb9f9fb9bee7dc8dcbcf963399b5 (diff)
1999-07-03 Thomas Bushnell, BSG <tb@mit.edu>
* file-get-trans.c (diskfs_S_file_get_translator): Use munmap instead of vm_deallocate. * io-read.c (diskfs_S_io_read): Likewise. * protid-rele.c (diskfs_protid_rele): Likewise.
Diffstat (limited to 'libdiskfs')
-rw-r--r--libdiskfs/ChangeLog7
-rw-r--r--libdiskfs/file-get-trans.c2
-rw-r--r--libdiskfs/io-read.c4
-rw-r--r--libdiskfs/protid-rele.c5
4 files changed, 12 insertions, 6 deletions
diff --git a/libdiskfs/ChangeLog b/libdiskfs/ChangeLog
index 26e7e714..51eeb6e4 100644
--- a/libdiskfs/ChangeLog
+++ b/libdiskfs/ChangeLog
@@ -1,3 +1,10 @@
+1999-07-03 Thomas Bushnell, BSG <tb@mit.edu>
+
+ * file-get-trans.c (diskfs_S_file_get_translator): Use munmap
+ instead of vm_deallocate.
+ * io-read.c (diskfs_S_io_read): Likewise.
+ * protid-rele.c (diskfs_protid_rele): Likewise.
+
1999-07-01 Thomas Bushnell, BSG <tb@mit.edu>
* node-nref.c: New file; guts from diskfs.h.
diff --git a/libdiskfs/file-get-trans.c b/libdiskfs/file-get-trans.c
index 2aa04c5c..77be4e1a 100644
--- a/libdiskfs/file-get-trans.c
+++ b/libdiskfs/file-get-trans.c
@@ -63,7 +63,7 @@ diskfs_S_file_get_translator (struct protid *cred,
*translen = len;
}
else if (len > *translen)
- vm_deallocate (mach_task_self (), (vm_address_t) trans, len);
+ munmap (trans, len);
}
else if (S_ISCHR (np->dn_stat.st_mode) || S_ISBLK (np->dn_stat.st_mode))
{
diff --git a/libdiskfs/io-read.c b/libdiskfs/io-read.c
index 80c103d8..b25359d7 100644
--- a/libdiskfs/io-read.c
+++ b/libdiskfs/io-read.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation
+ Copyright (C) 1994, 1995, 1996, 1997, 1999 Free Software Foundation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -100,7 +100,7 @@ diskfs_S_io_read (struct protid *cred,
cred->po->filepointer += *datalen;
if (err && ourbuf)
- vm_deallocate (mach_task_self (), (u_int) buf, maxread);
+ munmap (buf, maxread);
mutex_unlock (&np->lock);
return err;
diff --git a/libdiskfs/protid-rele.c b/libdiskfs/protid-rele.c
index 10ff6890..f0646027 100644
--- a/libdiskfs/protid-rele.c
+++ b/libdiskfs/protid-rele.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1994 Free Software Foundation
+ Copyright (C) 1994, 1999 Free Software Foundation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -30,8 +30,7 @@ diskfs_protid_rele (void *arg)
if (cred->shared_object)
mach_port_deallocate (mach_task_self (), cred->shared_object);
if (cred->mapped)
- vm_deallocate (mach_task_self (), (vm_address_t) cred->mapped,
- vm_page_size);
+ munmap (cred->mapped, vm_page_size);
diskfs_release_peropen (cred->po);
}