summaryrefslogtreecommitdiff
path: root/ufs
diff options
context:
space:
mode:
Diffstat (limited to 'ufs')
-rw-r--r--ufs/ChangeLog4
-rw-r--r--ufs/dir.c6
-rw-r--r--ufs/pager.c4
-rw-r--r--ufs/sizes.c6
4 files changed, 11 insertions, 9 deletions
diff --git a/ufs/ChangeLog b/ufs/ChangeLog
index 0ab45a3d..09d4b17a 100644
--- a/ufs/ChangeLog
+++ b/ufs/ChangeLog
@@ -1,3 +1,7 @@
+1999-09-13 Roland McGrath <roland@baalperazim.frob.com>
+
+ * dir.c, sizes.c, pager.c: Reverted changes related to io_map_segment.
+
1999-09-09 Roland McGrath <roland@baalperazim.frob.com>
* Makefile (makemode): servers -> server.
diff --git a/ufs/dir.c b/ufs/dir.c
index aee08bb0..304c8a44 100644
--- a/ufs/dir.c
+++ b/ufs/dir.c
@@ -144,7 +144,7 @@ diskfs_lookup_hard (struct node *dp, const char *name, enum lookup_type type,
ds->stat = LOOKING;
/* Map in the directory contents. */
- memobj = diskfs_get_filemap (dp, 0, prot);
+ memobj = diskfs_get_filemap (dp, prot);
if (memobj == MACH_PORT_NULL)
return errno;
@@ -730,7 +730,7 @@ diskfs_dirempty(struct node *dp,
memory_object_t memobj;
error_t err;
- memobj = diskfs_get_filemap (dp, 0, VM_PROT_READ);
+ memobj = diskfs_get_filemap (dp, VM_PROT_READ);
if (memobj == MACH_PORT_NULL)
/* XXX should reflect error properly */
@@ -839,7 +839,7 @@ diskfs_get_directs (struct node *dp,
char buf[DIRBLKSIZ];
char *bufp;
int bufvalid;
- error_t err = 0;
+ error_t err;
int i;
char *datap;
struct directory_entry *entryp;
diff --git a/ufs/pager.c b/ufs/pager.c
index 3cba748e..3038932d 100644
--- a/ufs/pager.c
+++ b/ufs/pager.c
@@ -547,13 +547,11 @@ flush_node_pager (struct node *node)
/* Call this to create a FILE_DATA pager and return a send right.
NP must be locked. PROT is the max protection desired. */
mach_port_t
-diskfs_get_filemap (struct node *np, int index, vm_prot_t prot)
+diskfs_get_filemap (struct node *np, vm_prot_t prot)
{
struct user_pager_info *upi;
mach_port_t right;
- assert (index == 0); /* XXX */
-
assert (S_ISDIR (np->dn_stat.st_mode)
|| S_ISREG (np->dn_stat.st_mode)
|| (S_ISLNK (np->dn_stat.st_mode)
diff --git a/ufs/sizes.c b/ufs/sizes.c
index cffce158..58cbfc98 100644
--- a/ufs/sizes.c
+++ b/ufs/sizes.c
@@ -103,7 +103,7 @@ diskfs_truncate (struct node *np,
pager_change_attributes (upi->p, MAY_CACHE,
MEMORY_OBJECT_COPY_NONE, 1);
- obj = diskfs_get_filemap (np, 0, VM_PROT_READ | VM_PROT_WRITE);
+ obj = diskfs_get_filemap (np, VM_PROT_READ | VM_PROT_WRITE);
if (obj != MACH_PORT_NULL)
{
/* XXX should cope with errors from diskfs_get_filemap */
@@ -403,7 +403,7 @@ block_extended (struct node *np,
volatile int *pokeaddr;
/* Map in this part of the file */
- mapobj = diskfs_get_filemap (np, 0, VM_PROT_WRITE | VM_PROT_READ);
+ mapobj = diskfs_get_filemap (np, VM_PROT_WRITE | VM_PROT_READ);
/* XXX Should cope with errors from diskfs_get_filemap and back
out the operation here. */
@@ -484,7 +484,7 @@ diskfs_grow (struct node *np,
assert (!diskfs_readonly);
/* This reference will ensure that NP->dn->fileinfo stays allocated. */
- pagerpt = diskfs_get_filemap (np, 0, VM_PROT_WRITE|VM_PROT_READ);
+ pagerpt = diskfs_get_filemap (np, VM_PROT_WRITE|VM_PROT_READ);
if (pagerpt == MACH_PORT_NULL)
return errno;