Changes to support version 3 of the NFS protocol.

The version 2 support has been tested (client+server) against FreeBSD-2.0,
IRIX 5.3 and FreeBSD-current (using a loopback mount).  The version 2 support
is stable AFAIK.
The version 3 support has been tested with a loopback mount and minimally
against an IRIX 5.3 server.  It needs more testing and may have problems.
I have patched amd to support the new variable length filehandles although
it will still only use version 2 of the protocol.

Before booting a kernel with these changes, nfs clients will need to at least
build and install /usr/sbin/mount_nfs.  Servers will need to build and
install /usr/sbin/mountd.

NFS diskless support is untested.

Obtained from: Rick Macklem <rick@snowhite.cis.uoguelph.ca>

1 files changed, 208 insertions, 153 deletions

diff --git a/sys/nfs/nfsv2.h b/sys/nfs/nfsv2.h
index 62ba338..1ae1a72 100644
--- a/sys/nfs/nfsv2.h
+++ b/sys/nfs/nfsv2.h
@@ -34,129 +34,201 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsv2.h	8.1 (Berkeley) 6/10/93
- * $Id: nfsv2.h,v 1.3 1994/08/18 22:35:37 wollman Exp $
+ * $Id: nfsv2.h,v 1.4 1994/08/21 06:50:13 paul Exp $
  */
 
-#ifndef _NFS_NFSV2_H_
-#define _NFS_NFSV2_H_
+#include <nfs/nfsproto.h>
+
+#if 0
+
 
 /*
- * nfs definitions as per the version 2 specs
+ * nfs definitions as per the Version 2 and 3 specs
  */
 
 /*
- * Constants as defined in the Sun NFS Version 2 spec.
+ * Constants as defined in the Sun NFS Version 2 and 3 specs.
  * "NFS: Network File System Protocol Specification" RFC1094
+ * and in the "NFS: Network File System Version 3 Protocol
+ * Specification"
  */
 
 #define NFS_PORT	2049
 #define	NFS_PROG	100003
 #define NFS_VER2	2
+#define	NFS_VER3	3
 #define	NFS_MAXDGRAMDATA 8192
 #define	NFS_MAXDATA	32768
 #define	NFS_MAXPATHLEN	1024
 #define	NFS_MAXNAMLEN	255
-#define	NFS_FHSIZE	32
 #define	NFS_MAXPKTHDR	404
-#define NFS_MAXPACKET	(NFS_MAXPKTHDR+NFS_MAXDATA)
+#define NFS_MAXPACKET	(NFS_MAXPKTHDR + NFS_MAXDATA)
 #define	NFS_MINPACKET	20
 #define	NFS_FABLKSIZE	512	/* Size in bytes of a block wrt fa_blocks */
 
-/* Stat numbers for rpc returns */
-#define	NFS_OK		0
-#define	NFSERR_PERM	1
-#define	NFSERR_NOENT	2
-#define	NFSERR_IO	5
-#define	NFSERR_NXIO	6
-#define	NFSERR_ACCES	13
-#define	NFSERR_EXIST	17
-#define	NFSERR_NODEV	19
-#define	NFSERR_NOTDIR	20
-#define	NFSERR_ISDIR	21
-#define	NFSERR_FBIG	27
-#define	NFSERR_NOSPC	28
-#define	NFSERR_ROFS	30
-#define	NFSERR_NAMETOL	63
-#define	NFSERR_NOTEMPTY	66
-#define	NFSERR_DQUOT	69
-#define	NFSERR_STALE	70
-#define	NFSERR_WFLUSH	99
+/* Stat numbers for rpc returns (version 2 and 3) */
+#define	NFS_OK			0
+#define	NFSERR_PERM		1
+#define	NFSERR_NOENT		2
+#define	NFSERR_IO		5
+#define	NFSERR_NXIO		6
+#define	NFSERR_ACCES		13
+#define	NFSERR_EXIST		17
+#define	NFSERR_XDEV		18	/* Version 3 only */
+#define	NFSERR_NODEV		19
+#define	NFSERR_NOTDIR		20
+#define	NFSERR_ISDIR		21
+#define	NFSERR_INVAL		22	/* Version 3 only */
+#define	NFSERR_FBIG		27
+#define	NFSERR_NOSPC		28
+#define	NFSERR_ROFS		30
+#define	NFSERR_MLINK		31	/* Version 3 only */
+#define	NFSERR_NAMETOL		63
+#define	NFSERR_NOTEMPTY		66
+#define	NFSERR_DQUOT		69
+#define	NFSERR_STALE		70
+#define	NFSERR_REMOTE		71	/* Version 3 only */
+#define	NFSERR_WFLUSH		99	/* Version 2 only */
+#define	NFSERR_BADHANDLE	10001	/* The rest Version 3 only */
+#define	NFSERR_NOT_SYNC		10002
+#define	NFSERR_BAD_COOKIE	10003
+#define	NFSERR_NOTSUPP		10004
+#define	NFSERR_TOOSMALL		10005
+#define	NFSERR_SERVERFAULT	10006
+#define	NFSERR_BADTYPE		10007
+#define	NFSERR_JUKEBOX		10008
 
 /* Sizes in bytes of various nfs rpc components */
-#define	NFSX_FH		32
 #define	NFSX_UNSIGNED	4
-#define	NFSX_NFSFATTR	68
-#define	NFSX_NQFATTR	92
-#define	NFSX_NFSSATTR	32
-#define	NFSX_NQSATTR	44
-#define	NFSX_COOKIE	4
-#define NFSX_NFSSTATFS	20
-#define	NFSX_NQSTATFS	28
-#define	NFSX_FATTR(isnq)	((isnq) ? NFSX_NQFATTR : NFSX_NFSFATTR)
-#define	NFSX_SATTR(isnq)	((isnq) ? NFSX_NQSATTR : NFSX_NFSSATTR)
-#define	NFSX_STATFS(isnq)	((isnq) ? NFSX_NQSTATFS : NFSX_NFSSTATFS)
 
-/* nfs rpc procedure numbers */
+/* specific to NFS Version 2 */
+#define	NFSX_V2FH	32
+#define	NFSX_V2FATTR	68
+#define	NFSX_V2SATTR	32
+#define	NFSX_V2COOKIE	4
+#define NFSX_V2STATFS	20
+
+/* specific to NFS Version 3 */
+#define NFSX_V3FH	16	/* size this server uses */
+#define	NFSX_V3FHMAX	64	/* max. allowed by protocol */
+#define NFSX_V3FATTR	84
+#define NFSX_V3SATTR	60	/* max. all fields filled in */
+#define NFSX_V3COOKIEVERF 8
+
+/* variants for both versions */
+#define NFSX_FH(v3)		((v3) ? (NFSX_V3FHMAX + NFSX_UNSIGNED) : \
+					NFSX_V2FH)
+#define NFSX_SRVFH(v3)		((v3) ? NFSX_V3FH : NFSX_V2FH)
+#define	NFSX_FATTR(v3)		((v3) ? NFSX_V3FATTR : NFSX_V2FATTR)
+#define NFSX_POSTOPATTR(v3)	((v3) ? (NFSX_V3FATTR + NFSX_UNSIGNED) : 0)
+#define NFSX_POSTOPORFATTR(v3)	((v3) ? (NFSX_V3FATTR + NFSX_UNSIGNED) : \
+					NFSX_V2FATTR)
+#define NFSX_WCCDATA(v3)	((v3) ? (NFSX_V3FATTR + 32) : 0)
+#define NFSX_WCCORFATTR(v3)	((v3) ? (NFSX_V3FATTR + 32) : NFSX_V2FATTR)
+#define	NFSX_SATTR(v3)		((v3) ? NFSX_V3SATTR : NFSX_V2SATTR)
+#define	NFSX_COOKIEVERF(v3)	((v3) ? NFSX_V3COOKIEVERF : 0)
+#define	NFSX_STATFS(isv3)	((isv3) ? NFSX_NFSV3STATFS : NFSX_NFSSTATFS)
+
+/* nfs rpc procedure numbers (before version mapping) */
 #define	NFSPROC_NULL		0
 #define	NFSPROC_GETATTR		1
 #define	NFSPROC_SETATTR		2
-#define	NFSPROC_NOOP		3
-#define	NFSPROC_ROOT		NFSPROC_NOOP	/* Obsolete */
-#define	NFSPROC_LOOKUP		4
+#define	NFSPROC_LOOKUP		3
+#define	NFSPROC_ACCESS		4
 #define	NFSPROC_READLINK	5
 #define	NFSPROC_READ		6
-#define	NFSPROC_WRITECACHE	NFSPROC_NOOP	/* Obsolete */
-#define	NFSPROC_WRITE		8
-#define	NFSPROC_CREATE		9
-#define	NFSPROC_REMOVE		10
-#define	NFSPROC_RENAME		11
-#define	NFSPROC_LINK		12
-#define	NFSPROC_SYMLINK		13
-#define	NFSPROC_MKDIR		14
-#define	NFSPROC_RMDIR		15
+#define	NFSPROC_WRITE		7
+#define	NFSPROC_CREATE		8
+#define	NFSPROC_MKDIR		9
+#define	NFSPROC_SYMLINK		10
+#define	NFSPROC_MKNOD		11
+#define	NFSPROC_REMOVE		12
+#define	NFSPROC_RMDIR		13
+#define	NFSPROC_RENAME		14
+#define	NFSPROC_LINK		15
 #define	NFSPROC_READDIR		16
-#define	NFSPROC_STATFS		17
+#define	NFSPROC_READDIRPLUS	17
+#define	NFSPROC_FSSTAT		18
+#define	NFSPROC_FSINFO		19
+#define	NFSPROC_PATHCONF	20
+#define	NFSPROC_COMMIT		21
 
-/* NQ nfs numbers */
-#define	NQNFSPROC_READDIRLOOK	18
-#define	NQNFSPROC_GETLEASE	19
-#define	NQNFSPROC_VACATED	20
-#define	NQNFSPROC_EVICTED	21
-#define	NQNFSPROC_ACCESS	22
+/* And leasing (nqnfs) procedure numbers */
+#define	NQNFSPROC_GETLEASE	22
+#define	NQNFSPROC_VACATED	23
+#define	NQNFSPROC_EVICTED	24
+
+#define	NFS_NPROCS		25
+
+/* Actual Version 2 procedure numbers */
+#define	NFSV2PROC_NULL		0
+#define	NFSV2PROC_GETATTR	1
+#define	NFSV2PROC_SETATTR	2
+#define	NFSV2PROC_NOOP		3
+#define	NFSV2PROC_ROOT		NFSV2PROC_NOOP	/* Obsolete */
+#define	NFSV2PROC_LOOKUP	4
+#define	NFSV2PROC_READLINK	5
+#define	NFSV2PROC_READ		6
+#define	NFSV2PROC_WRITECACHE	NFSV2PROC_NOOP	/* Obsolete */
+#define	NFSV2PROC_WRITE		8
+#define	NFSV2PROC_CREATE	9
+#define	NFSV2PROC_REMOVE	10
+#define	NFSV2PROC_RENAME	11
+#define	NFSV2PROC_LINK		12
+#define	NFSV2PROC_SYMLINK	13
+#define	NFSV2PROC_MKDIR		14
+#define	NFSV2PROC_RMDIR		15
+#define	NFSV2PROC_READDIR	16
+#define	NFSV2PROC_STATFS	17
 
-#define	NFS_NPROCS		23
 /* Conversion macros */
-#define	vtonfs_mode(t,m) \
+extern int		vttoif_tab[];
+#define	vtonfsv2_mode(t,m) \
 		txdr_unsigned(((t) == VFIFO) ? MAKEIMODE(VCHR, (m)) : \
 				MAKEIMODE((t), (m)))
-#define	nfstov_mode(a)	(fxdr_unsigned(u_short, (a))&07777)
-#define	vtonfs_type(a)	txdr_unsigned(nfs_type[((long)(a))])
-#define	nfstov_type(a)	ntov_type[fxdr_unsigned(u_long,(a))&0x7]
+#define vtonfsv3_mode(m)	txdr_unsigned((m) & 07777)
+#define	nfstov_mode(a)		(fxdr_unsigned(u_short, (a))&07777)
+#define	vtonfsv2_type(a)	txdr_unsigned(nfsv2_type[((long)(a))])
+#define	vtonfsv3_type(a)	txdr_unsigned(nfsv3_type[((long)(a))])
+#define	nfsv2tov_type(a)	nv2tov_type[fxdr_unsigned(u_long,(a))&0x7]
+#define	nfsv3tov_type(a)	nv3tov_type[fxdr_unsigned(u_long,(a))&0x7]
 
 /* File types */
-typedef enum { NFNON=0, NFREG=1, NFDIR=2, NFBLK=3, NFCHR=4, NFLNK=5 } nfstype;
+typedef enum { NFNON=0, NFREG=1, NFDIR=2, NFBLK=3, NFCHR=4, NFLNK=5,
+	NFSOCK=6, NFFIFO=7 } nfstype;
 
 /* Structs for common parts of the rpc's */
 struct nfsv2_time {
-	u_long	nfs_sec;
-	u_long	nfs_usec;
+	u_long	nfsv2_sec;
+	u_long	nfsv2_usec;
+};
+typedef struct nfsv2_time	nfstime2;
+
+struct nfsv3_time {
+	u_long	nfsv3_sec;
+	u_long	nfsv3_nsec;
 };
+typedef struct nfsv3_time	nfstime3;
 
-struct nqnfs_time {
-	u_long	nq_sec;
-	u_long	nq_nsec;
+/*
+ * Quads are defined as arrays of 2 longs to ensure dense packing for the
+ * protocol and to facilitate xdr conversion.
+ */
+struct nfs_uquad {
+	u_long	nfsuquad[2];
 };
+typedef	struct nfs_uquad	nfsuint64;
 
 /*
  * File attributes and setable attributes. These structures cover both
- * NFS version 2 and the NQNFS protocol. Note that the union is only
- * used to that one pointer can refer to both variants. These structures
+ * NFS version 2 and the version 3 protocol. Note that the union is only
+ * used so that one pointer can refer to both variants. These structures
  * go out on the wire and must be densely packed, so no quad data types
  * are used. (all fields are longs or u_longs or structures of same)
- * NB: You can't do sizeof(struct nfsv2_fattr), you must use the
- *     NFSX_FATTR(isnq) macro.
+ * NB: You can't do sizeof(struct nfs_fattr), you must use the
+ *     NFSX_FATTR(v3) macro.
  */
-struct nfsv2_fattr {
+struct nfs_fattr {
 	u_long	fa_type;
 	u_long	fa_mode;
 	u_long	fa_nlink;
@@ -164,102 +236,85 @@ struct nfsv2_fattr {
 	u_long	fa_gid;
 	union {
 		struct {
-			u_long	nfsfa_size;
-			u_long	nfsfa_blocksize;
-			u_long	nfsfa_rdev;
-			u_long	nfsfa_blocks;
-			u_long	nfsfa_fsid;
-			u_long	nfsfa_fileid;
-			struct nfsv2_time nfsfa_atime;
-			struct nfsv2_time nfsfa_mtime;
-			struct nfsv2_time nfsfa_ctime;
+			u_long		nfsv2fa_size;
+			u_long		nfsv2fa_blocksize;
+			u_long		nfsv2fa_rdev;
+			u_long		nfsv2fa_blocks;
+			u_long		nfsv2fa_fsid;
+			u_long		nfsv2fa_fileid;
+			nfstime2	nfsv2fa_atime;
+			nfstime2	nfsv2fa_mtime;
+			nfstime2	nfsv2fa_ctime;
 		} fa_nfsv2;
 		struct {
-			struct {
-				u_long	nqfa_qsize[2];
-			} nqfa_size;
-			u_long	nqfa_blocksize;
-			u_long	nqfa_rdev;
-			struct {
-				u_long	nqfa_qbytes[2];
-			} nqfa_bytes;
-			u_long	nqfa_fsid;
-			u_long	nqfa_fileid;
-			struct nqnfs_time nqfa_atime;
-			struct nqnfs_time nqfa_mtime;
-			struct nqnfs_time nqfa_ctime;
-			u_long	nqfa_flags;
-			u_long	nqfa_gen;
-			struct {
-				u_long	nqfa_qfilerev[2];
-			} nqfa_filerev;
-		} fa_nqnfs;
+			nfsuint64	nfsv3fa_size;
+			nfsuint64	nfsv3fa_used;
+			nfsuint64	nfsv3fa_rdev;
+			nfsuint64	nfsv3fa_fsid;
+			nfsuint64	nfsv3fa_fileid;
+			nfstime3	nfsv3fa_atime;
+			nfstime3	nfsv3fa_mtime;
+			nfstime3	nfsv3fa_ctime;
+		} fa_nfsv3;
 	} fa_un;
 };
 
 /* and some ugly defines for accessing union components */
-#define	fa_nfssize		fa_un.fa_nfsv2.nfsfa_size
-#define	fa_nfsblocksize		fa_un.fa_nfsv2.nfsfa_blocksize
-#define	fa_nfsrdev		fa_un.fa_nfsv2.nfsfa_rdev
-#define	fa_nfsblocks		fa_un.fa_nfsv2.nfsfa_blocks
-#define	fa_nfsfsid		fa_un.fa_nfsv2.nfsfa_fsid
-#define	fa_nfsfileid		fa_un.fa_nfsv2.nfsfa_fileid
-#define	fa_nfsatime		fa_un.fa_nfsv2.nfsfa_atime
-#define	fa_nfsmtime		fa_un.fa_nfsv2.nfsfa_mtime
-#define	fa_nfsctime		fa_un.fa_nfsv2.nfsfa_ctime
-#define	fa_nqsize		fa_un.fa_nqnfs.nqfa_size
-#define	fa_nqblocksize		fa_un.fa_nqnfs.nqfa_blocksize
-#define	fa_nqrdev		fa_un.fa_nqnfs.nqfa_rdev
-#define	fa_nqbytes		fa_un.fa_nqnfs.nqfa_bytes
-#define	fa_nqfsid		fa_un.fa_nqnfs.nqfa_fsid
-#define	fa_nqfileid		fa_un.fa_nqnfs.nqfa_fileid
-#define	fa_nqatime		fa_un.fa_nqnfs.nqfa_atime
-#define	fa_nqmtime		fa_un.fa_nqnfs.nqfa_mtime
-#define	fa_nqctime		fa_un.fa_nqnfs.nqfa_ctime
-#define	fa_nqflags		fa_un.fa_nqnfs.nqfa_flags
-#define	fa_nqgen		fa_un.fa_nqnfs.nqfa_gen
-#define	fa_nqfilerev		fa_un.fa_nqnfs.nqfa_filerev
+#define	fa2_size		fa_un.fa_nfsv2.nfsv2fa_size
+#define	fa2_blocksize		fa_un.fa_nfsv2.nfsv2fa_blocksize
+#define	fa2_rdev		fa_un.fa_nfsv2.nfsv2fa_rdev
+#define	fa2_blocks		fa_un.fa_nfsv2.nfsv2fa_blocks
+#define	fa2_fsid		fa_un.fa_nfsv2.nfsv2fa_fsid
+#define	fa2_fileid		fa_un.fa_nfsv2.nfsv2fa_fileid
+#define	fa2_atime		fa_un.fa_nfsv2.nfsv2fa_atime
+#define	fa2_mtime		fa_un.fa_nfsv2.nfsv2fa_mtime
+#define	fa2_ctime		fa_un.fa_nfsv2.nfsv2fa_ctime
+#define	fa3_size		fa_un.fa_nfsv3.nfsv3fa_size
+#define	fa3_used		fa_un.fa_nfsv3.nfsv3fa_used
+#define	fa3_rdev		fa_un.fa_nfsv3.nfsv3fa_rdev
+#define	fa3_fsid		fa_un.fa_nfsv3.nfsv3fa_fsid
+#define	fa3_fileid		fa_un.fa_nfsv3.nfsv3fa_fileid
+#define	fa3_atime		fa_un.fa_nfsv3.nfsv3fa_atime
+#define	fa3_mtime		fa_un.fa_nfsv3.nfsv3fa_mtime
+#define	fa3_ctime		fa_un.fa_nfsv3.nfsv3fa_ctime
 
 struct nfsv2_sattr {
-	u_long	sa_mode;
-	u_long	sa_uid;
-	u_long	sa_gid;
-	union {
-		struct {
-			u_long	nfssa_size;
-			struct nfsv2_time nfssa_atime;
-			struct nfsv2_time nfssa_mtime;
-		} sa_nfsv2;
-		struct {
-			struct {
-				u_long	nqsa_qsize[2];
-			} nqsa_size;
-			struct nqnfs_time nqsa_atime;
-			struct nqnfs_time nqsa_mtime;
-			u_long	nqsa_flags;
-			u_long	nqsa_rdev;
-		} sa_nqnfs;
-	} sa_un;
+	u_long		sa_mode;
+	u_long		sa_uid;
+	u_long		sa_gid;
+	u_long		sa_size;
+	nfstime2	sa_atime;
+	nfstime2	sa_mtime;
 };
 
-/* and some ugly defines for accessing the unions */
-#define	sa_nfssize		sa_un.sa_nfsv2.nfssa_size
-#define	sa_nfsatime		sa_un.sa_nfsv2.nfssa_atime
-#define	sa_nfsmtime		sa_un.sa_nfsv2.nfssa_mtime
-#define	sa_nqsize		sa_un.sa_nqnfs.nqsa_size
-#define	sa_nqatime		sa_un.sa_nqnfs.nqsa_atime
-#define	sa_nqmtime		sa_un.sa_nqnfs.nqsa_mtime
-#define	sa_nqflags		sa_un.sa_nqnfs.nqsa_flags
-#define	sa_nqrdev		sa_un.sa_nqnfs.nqsa_rdev
-
 struct nfsv2_statfs {
 	u_long	sf_tsize;
 	u_long	sf_bsize;
 	u_long	sf_blocks;
 	u_long	sf_bfree;
 	u_long	sf_bavail;
-	u_long	sf_files;	/* Nqnfs only */
-	u_long	sf_ffree;	/* ditto      */
 };
 
+struct nfsv3_fsstat {
+	nfsuint64	sf_tbytes;
+	nfsuint64	sf_fbytes;
+	nfsuint64	sf_abytes;
+	nfsuint64	sf_tfiles;
+	nfsuint64	sf_ffiles;
+	nfsuint64	sf_afiles;
+	u_long		sf_invarsec;
+};
+
+struct nfsv3_fsinfo {
+	u_long		fs_rtmax;
+	u_long		fs_rtpref;
+	u_long		fs_rtmult;
+	u_long		fs_wtmax;
+	u_long		fs_wtpref;
+	u_long		fs_wtmult;
+	u_long		fs_dtpref;
+	nfsuint64	fs_maxfilesize;
+	nfstime3	fs_time_delta;
+	u_long		fs_properties;
+};
 #endif