summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nfs/ChangeLog6
-rw-r--r--nfs/ops.c10
2 files changed, 12 insertions, 4 deletions
diff --git a/nfs/ChangeLog b/nfs/ChangeLog
index 7dfb32d5..8894c435 100644
--- a/nfs/ChangeLog
+++ b/nfs/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-26 Marcus Brinkmann <marcus@gnu.org>
+
+ * ops.c (netfs_attempt_mkdir): Add casts -1 -> (struct iouser *) -1
+ to silence gcc warning.
+ (netfs_attempt_create_file): Likewise.
+
2000-07-26 Mark Kettenis <kettenis@gnu.org>
* Makefile (HURDLIBS): Reorder libs such that the threads lib
diff --git a/nfs/ops.c b/nfs/ops.c
index c8e7615b..cca39996 100644
--- a/nfs/ops.c
+++ b/nfs/ops.c
@@ -684,8 +684,10 @@ netfs_attempt_mkdir (struct iouser *cred, struct node *np,
p = process_returned_stat (newnp, p, 1);
/* Did we set the owner correctly? If not, try, but ignore failures. */
- if (!netfs_validate_stat (newnp, -1) && newnp->nn_stat.st_uid != owner)
- netfs_attempt_chown (-1, newnp, owner, newnp->nn_stat.st_gid);
+ if (!netfs_validate_stat (newnp, (struct iouser *) -1)
+ && newnp->nn_stat.st_uid != owner)
+ netfs_attempt_chown ((struct iouser *) -1, newnp, owner,
+ newnp->nn_stat.st_gid);
/* We don't actually return this. */
netfs_nput (newnp);
@@ -1097,9 +1099,9 @@ netfs_attempt_create_file (struct iouser *cred, struct node *np,
mutex_lock (&(*newnp)->lock);
}
- if (*newnp && !netfs_validate_stat (*newnp, -1)
+ if (*newnp && !netfs_validate_stat (*newnp, (struct iouser *) -1)
&& (*newnp)->nn_stat.st_uid != owner)
- netfs_attempt_chown (-1, *newnp, owner, (*newnp)->nn_stat.st_gid);
+ netfs_attempt_chown ((struct iouser *) -1, *newnp, owner, (*newnp)->nn_stat.st_gid);
}
else
*newnp = 0;