summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tmpfs/dir.c8
-rw-r--r--tmpfs/tmpfs.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/tmpfs/dir.c b/tmpfs/dir.c
index e8776e39..80b7a97c 100644
--- a/tmpfs/dir.c
+++ b/tmpfs/dir.c
@@ -1,5 +1,5 @@
/* Directories for tmpfs.
- Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 2000,01,02 Free Software Foundation, Inc.
This file is part of the GNU Hurd.
@@ -51,7 +51,7 @@ diskfs_dirempty (struct node *dp, struct protid *cred)
error_t
diskfs_get_directs (struct node *dp, int entry, int n,
- char **data, u_int *datacnt,
+ char **data, size_t *datacnt,
vm_size_t bufsiz, int *amt)
{
struct tmpfs_dirent *d;
@@ -198,7 +198,7 @@ diskfs_lookup_hard (struct node *dp,
else
{
mutex_unlock (&dp->lock);
- err = diskfs_cached_lookup ((int) dddn, np);
+ err = diskfs_cached_lookup ((int) dddn, dp, np);
if (type == (LOOKUP|SPEC_DOTDOT))
diskfs_nrele (dp);
@@ -220,7 +220,7 @@ diskfs_lookup_hard (struct node *dp,
ds->prevp = prevp;
if (np)
- return diskfs_cached_lookup ((ino_t) d->dn, np);
+ return diskfs_cached_lookup ((ino_t) d->dn, dp, np);
else
return 0;
}
diff --git a/tmpfs/tmpfs.c b/tmpfs/tmpfs.c
index 6c97753a..536527f7 100644
--- a/tmpfs/tmpfs.c
+++ b/tmpfs/tmpfs.c
@@ -231,7 +231,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
/* Override the standard diskfs routine so we can add our own output. */
error_t
-diskfs_append_args (char **argz, unsigned *argz_len)
+diskfs_append_args (char **argz, size_t *argz_len)
{
error_t err;