diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-04-18 21:21:51 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-04-18 21:21:51 +0000 |
| commit | 978f49b07eda30472d402394cf556da0873c9ac8 (patch) | |
| tree | ece61b27d7369bb7fa11fd7fbd739bd32dbfa57b /sys/compat/ultrix/ultrix_fs.c | |
| parent | bb5bb38ef44e5df2b16e0d24f7542d8dd541cbba (diff) | |
Merge of NetBSD 960317
Diffstat (limited to 'sys/compat/ultrix/ultrix_fs.c')
| -rw-r--r-- | sys/compat/ultrix/ultrix_fs.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/compat/ultrix/ultrix_fs.c b/sys/compat/ultrix/ultrix_fs.c index 9829c895d32..7dd43d413c6 100644 --- a/sys/compat/ultrix/ultrix_fs.c +++ b/sys/compat/ultrix/ultrix_fs.c @@ -1,4 +1,5 @@ -/* $NetBSD: ultrix_fs.c,v 1.2 1995/12/26 10:06:14 jonathan Exp $ */ +/* $OpenBSD: ultrix_fs.c,v 1.2 1996/04/18 21:21:49 niklas Exp $ */ +/* $NetBSD: ultrix_fs.c,v 1.3 1996/02/19 15:41:39 pk Exp $ */ /* * Copyright (c) 1995 @@ -37,6 +38,9 @@ #include <net/if.h> #include <netinet/in.h> +#include <nfs/rpcv2.h> +#include <nfs/nfsproto.h> +#include <nfs/nfs.h> #include <sys/syscallargs.h> #include <compat/ultrix/ultrix_syscallargs.h> @@ -292,7 +296,7 @@ struct osockaddr_in { */ struct ultrix_nfs_args { struct osockaddr_in *addr; /* file server address */ - nfsv2fh_t *fh; /* file handle to be mounted */ + void *fh; /* file handle to be mounted */ int flags; /* flags */ int wsize; /* write size in bytes */ int rsize; /* read size in bytes */ @@ -415,12 +419,14 @@ ultrix_sys_mount(p, v, retval) SCARG(&nuap, data) = usp; usp += sizeof (na); /* allocate space above caller's stack for server sockaddr */ + na.version = NFS_ARGSVERSION; na.addr = (struct sockaddr *)usp; usp += sizeof(*sap); na.addrlen = sap->sin_len; na.sotype = SOCK_DGRAM; na.proto = IPPROTO_UDP; na.fh = una.fh; + na.fhsize = NFSX_V2FH; na.flags = /*una.flags;*/ NFSMNT_NOCONN | NFSMNT_RESVPORT; na.wsize = una.wsize; na.rsize = una.rsize; |