From 2a061ebb71bf7a93d5e7ed71fa13dd7005745965 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Mon, 13 Sep 1999 06:35:11 +0000
Subject: Reverted changes related to io_map_segment.
---
libdiskfs/ChangeLog | 5 +++
libdiskfs/Makefile | 3 +-
libdiskfs/diskfs.h | 9 +++---
libdiskfs/io-map-segment.c | 78 ----------------------------------------------
libdiskfs/io-map.c | 44 ++++++++++++++++++++++++--
libdiskfs/rdwr-internal.c | 4 +--
6 files changed, 54 insertions(+), 89 deletions(-)
delete mode 100644 libdiskfs/io-map-segment.c
(limited to 'libdiskfs')
diff --git a/libdiskfs/ChangeLog b/libdiskfs/ChangeLog
index fecf02e2..77d0bc0b 100644
--- a/libdiskfs/ChangeLog
+++ b/libdiskfs/ChangeLog
@@ -1,3 +1,8 @@
+1999-09-13 Roland McGrath <roland@baalperazim.frob.com>
+
+ * Makefile, rdwr-internal.c, io-map.c, io-map-segment.c, diskfs.h:
+ Reverted changes related to io_map_segment.
+
1999-09-09 Thomas Bushnell, BSG <tb@mit.edu>
* io-pathconf.c: Include <unistd.h>.
diff --git a/libdiskfs/Makefile b/libdiskfs/Makefile
index a4637657..612aaea2 100644
--- a/libdiskfs/Makefile
+++ b/libdiskfs/Makefile
@@ -32,8 +32,7 @@ IOSRCS= io-async-icky.c io-async.c io-duplicate.c io-get-conch.c io-revoke.c \
io-modes-on.c io-modes-set.c io-owner-mod.c io-owner-get.c \
io-pathconf.c io-prenotify.c io-read.c io-readable.c io-identity.c \
io-reauthenticate.c io-rel-conch.c io-restrict-auth.c io-seek.c \
- io-select.c io-stat.c io-stubs.c io-write.c io-version.c io-sigio.c \
- io-map-segment.c
+ io-select.c io-stat.c io-stubs.c io-write.c io-version.c io-sigio.c
FSYSSRCS=fsys-getroot.c fsys-goaway.c fsys-startup.c fsys-getfile.c \
fsys-options.c fsys-syncfs.c fsys-forward.c
IFSOCKSRCS=ifsock.c
diff --git a/libdiskfs/diskfs.h b/libdiskfs/diskfs.h
index 499bfd5b..73c55faf 100644
--- a/libdiskfs/diskfs.h
+++ b/libdiskfs/diskfs.h
@@ -486,11 +486,10 @@ void diskfs_sync_everything (int wait);
irreversable. */
void diskfs_shutdown_pager ();
-/* The user must define this function. Return a memory object port
- (send right) for the INDEX'th 2^32 byte segment of the contents of
- NP. PROT is the maximum allowable access. On errors, return
- MACH_PORT_NULL and set errno. */
-mach_port_t diskfs_get_filemap (struct node *np, int index, vm_prot_t prot);
+/* The user must define this function. Return a memory object port (send
+ right) for the file contents of NP. PROT is the maximum allowable
+ access. On errors, return MACH_PORT_NULL and set errno. */
+mach_port_t diskfs_get_filemap (struct node *np, vm_prot_t prot);
/* The user must define this function. Return true if there are pager
ports exported that might be in use by users. If this returns false, then
diff --git a/libdiskfs/io-map-segment.c b/libdiskfs/io-map-segment.c
deleted file mode 100644
index 4245602d..00000000
--- a/libdiskfs/io-map-segment.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- Copyright (C) 1999 Free Software Foundation, Inc.
- Written by Thomas Bushnell, BSG.
-
- This file is part of the GNU Hurd.
-
- The GNU Hurd is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2, or (at
- your option) any later version.
-
- The GNU Hurd is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */
-
-#include <fcntl.h>
-
-#include "priv.h"
-#include "io_S.h"
-
-/* Implement io_map as described in <hurd/io.defs>. */
-kern_return_t
-diskfs_S_io_map_segment (struct protid *cred,
- int index,
- memory_object_t *rdobj,
- mach_msg_type_name_t *rdtype,
- memory_object_t *wrobj,
- mach_msg_type_name_t *wrtype)
-{
- int flags;
- struct node *node;
-
- if (!cred)
- return EOPNOTSUPP;
-
- *wrobj = *rdobj = MACH_PORT_NULL;
-
- node = cred->po->np;
- flags = cred->po->openstat & (O_READ | O_WRITE);
-
- mutex_lock (&node->lock);
- switch (flags)
- {
- case O_READ | O_WRITE:
- *wrobj = *rdobj = diskfs_get_filemap (node, index,
- VM_PROT_READ |VM_PROT_WRITE);
- if (*wrobj == MACH_PORT_NULL)
- goto error;
- mach_port_mod_refs (mach_task_self (), *rdobj, MACH_PORT_RIGHT_SEND, 1);
- break;
- case O_READ:
- *rdobj = diskfs_get_filemap (node, index, VM_PROT_READ);
- if (*rdobj == MACH_PORT_NULL)
- goto error;
- break;
- case O_WRITE:
- *wrobj = diskfs_get_filemap (node, index, VM_PROT_WRITE);
- if (*wrobj == MACH_PORT_NULL)
- goto error;
- break;
- }
- mutex_unlock (&node->lock);
-
- *rdtype = MACH_MSG_TYPE_MOVE_SEND;
- *wrtype = MACH_MSG_TYPE_MOVE_SEND;
-
- return 0;
-
-error:
- mutex_unlock (&node->lock);
- return errno;
-}
-
diff --git a/libdiskfs/io-map.c b/libdiskfs/io-map.c
index acd8adc6..6268f2c5 100644
--- a/libdiskfs/io-map.c
+++ b/libdiskfs/io-map.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1994, 1997, 1999 Free Software Foundation
+ Copyright (C) 1994, 1997 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
@@ -28,6 +28,46 @@ diskfs_S_io_map (struct protid *cred,
memory_object_t *wrobj,
mach_msg_type_name_t *wrtype)
{
- return diskfs_S_io_map_segment (cred, 0, rdobj, rdtype, wrobj, wrtype);
+ int flags;
+ struct node *node;
+
+ if (!cred)
+ return EOPNOTSUPP;
+
+ *wrobj = *rdobj = MACH_PORT_NULL;
+
+ node = cred->po->np;
+ flags = cred->po->openstat & (O_READ | O_WRITE);
+
+ mutex_lock (&node->lock);
+ switch (flags)
+ {
+ case O_READ | O_WRITE:
+ *wrobj = *rdobj = diskfs_get_filemap (node, VM_PROT_READ |VM_PROT_WRITE);
+ if (*wrobj == MACH_PORT_NULL)
+ goto error;
+ mach_port_mod_refs (mach_task_self (), *rdobj, MACH_PORT_RIGHT_SEND, 1);
+ break;
+ case O_READ:
+ *rdobj = diskfs_get_filemap (node, VM_PROT_READ);
+ if (*rdobj == MACH_PORT_NULL)
+ goto error;
+ break;
+ case O_WRITE:
+ *wrobj = diskfs_get_filemap (node, VM_PROT_WRITE);
+ if (*wrobj == MACH_PORT_NULL)
+ goto error;
+ break;
+ }
+ mutex_unlock (&node->lock);
+
+ *rdtype = MACH_MSG_TYPE_MOVE_SEND;
+ *wrtype = MACH_MSG_TYPE_MOVE_SEND;
+
+ return 0;
+
+error:
+ mutex_unlock (&node->lock);
+ return errno;
}
diff --git a/libdiskfs/rdwr-internal.c b/libdiskfs/rdwr-internal.c
index 4c765aaa..046467a3 100644
--- a/libdiskfs/rdwr-internal.c
+++ b/libdiskfs/rdwr-internal.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1994, 1995, 1996, 1997, 1999 Free Software Foundation
+ Copyright (C) 1994, 1995, 1996, 1997 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
@@ -49,7 +49,7 @@ _diskfs_rdwr_internal (struct node *np,
np->dn_set_atime = 1;
}
- memobj = diskfs_get_filemap (np, 0, prot);
+ memobj = diskfs_get_filemap (np, prot);
if (memobj == MACH_PORT_NULL)
return errno;
--
cgit v1.2.3