diff options
Diffstat (limited to 'ext2fs')
| -rw-r--r-- | ext2fs/ChangeLog | 5 | ||||
| -rw-r--r-- | ext2fs/dir.c | 4 | ||||
| -rw-r--r-- | ext2fs/pager.c | 4 | ||||
| -rw-r--r-- | ext2fs/truncate.c | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/ext2fs/ChangeLog b/ext2fs/ChangeLog index 21f4081f..70b623b7 100644 --- a/ext2fs/ChangeLog +++ b/ext2fs/ChangeLog @@ -1,3 +1,8 @@ +1999-09-13 Roland McGrath <roland@baalperazim.frob.com> + + * dir.c, truncate.c, pager.c: Reverted changes related to + io_map_segment. + 1999-09-09 Roland McGrath <roland@baalperazim.frob.com> * Makefile (makemode): server -> servers. diff --git a/ext2fs/dir.c b/ext2fs/dir.c index 61ca3f0f..84f772a0 100644 --- a/ext2fs/dir.c +++ b/ext2fs/dir.c @@ -152,7 +152,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; @@ -721,7 +721,7 @@ diskfs_dirempty (struct node *dp, struct protid *cred) vm_address_t buf = 0, curoff; struct ext2_dir_entry_2 *entry; int hit = 0; /* Found something in the directory. */ - memory_object_t memobj = diskfs_get_filemap (dp, 0, VM_PROT_READ); + memory_object_t memobj = diskfs_get_filemap (dp, VM_PROT_READ); if (memobj == MACH_PORT_NULL) /* XXX should reflect error properly. */ diff --git a/ext2fs/pager.c b/ext2fs/pager.c index 270bbd9a..8981390e 100644 --- a/ext2fs/pager.c +++ b/ext2fs/pager.c @@ -777,12 +777,10 @@ create_disk_pager (void) /* Call this to create a FILE_DATA pager and return a send right. NODE must be locked. */ mach_port_t -diskfs_get_filemap (struct node *node, int index, vm_prot_t prot) +diskfs_get_filemap (struct node *node, vm_prot_t prot) { mach_port_t right; - assert (index == 0); /* XXX */ - assert (S_ISDIR (node->dn_stat.st_mode) || S_ISREG (node->dn_stat.st_mode) || (S_ISLNK (node->dn_stat.st_mode))); diff --git a/ext2fs/truncate.c b/ext2fs/truncate.c index 8113f9bf..5c8e0829 100644 --- a/ext2fs/truncate.c +++ b/ext2fs/truncate.c @@ -232,7 +232,7 @@ force_delayed_copies (struct node *node, off_t length) mach_port_t obj; pager_change_attributes (pager, MAY_CACHE, MEMORY_OBJECT_COPY_NONE, 1); - obj = diskfs_get_filemap (node, 0, VM_PROT_READ); + obj = diskfs_get_filemap (node, VM_PROT_READ); if (obj != MACH_PORT_NULL) { /* XXX should cope with errors from diskfs_get_filemap */ |