diff options
| author | Thomas Bushnell <thomas@gnu.org> | 1999-09-08 08:39:10 +0000 |
|---|---|---|
| committer | Thomas Bushnell <thomas@gnu.org> | 1999-09-08 08:39:10 +0000 |
| commit | 60aeeb0099a6595f023845f5f7ec8f5a12f73c9e (patch) | |
| tree | 2b6f46283ac7eae7b0347f1a73a43a789f639db7 | |
| parent | 4ad1c1f75bf97ce7888b99f6850b41f9f5789ec8 (diff) | |
1999-09-07 Thomas Bushnell, BSG <tb@mit.edu>
* dir.c (diskfs_lookup_hard): Pass additional parameter to
diskfs_get_filemap.
(diskfs_dirempty): Likewise.
* truncate.c (force_delayed_copies): Likewise.
* pager.c (diskfs_get_filemap): Accept additional parameter.
| -rw-r--r-- | ext2fs/ChangeLog | 8 | ||||
| -rw-r--r-- | ext2fs/dir.c | 4 | ||||
| -rw-r--r-- | ext2fs/pager.c | 4 | ||||
| -rw-r--r-- | ext2fs/truncate.c | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/ext2fs/ChangeLog b/ext2fs/ChangeLog index ee8b3b77..d6c8f15b 100644 --- a/ext2fs/ChangeLog +++ b/ext2fs/ChangeLog @@ -1,3 +1,11 @@ +1999-09-07 Thomas Bushnell, BSG <tb@mit.edu> + + * dir.c (diskfs_lookup_hard): Pass additional parameter to + diskfs_get_filemap. + (diskfs_dirempty): Likewise. + * truncate.c (force_delayed_copies): Likewise. + * pager.c (diskfs_get_filemap): Accept additional parameter. + 1999-09-04 Thomas Bushnell, BSG <tb@mit.edu> * pager.c (file_pager_write_page): Don't report errors on writes diff --git a/ext2fs/dir.c b/ext2fs/dir.c index 84f772a0..61ca3f0f 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, prot); + memobj = diskfs_get_filemap (dp, 0, 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, VM_PROT_READ); + memory_object_t memobj = diskfs_get_filemap (dp, 0, VM_PROT_READ); if (memobj == MACH_PORT_NULL) /* XXX should reflect error properly. */ diff --git a/ext2fs/pager.c b/ext2fs/pager.c index 8981390e..270bbd9a 100644 --- a/ext2fs/pager.c +++ b/ext2fs/pager.c @@ -777,10 +777,12 @@ 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, vm_prot_t prot) +diskfs_get_filemap (struct node *node, int index, 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 5c8e0829..8113f9bf 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, VM_PROT_READ); + obj = diskfs_get_filemap (node, 0, VM_PROT_READ); if (obj != MACH_PORT_NULL) { /* XXX should cope with errors from diskfs_get_filemap */ |