Update to reflect new Lite2 mount.h and friends.

1 files changed, 53 insertions, 50 deletions

diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2
index 6c56b77..4ee86a6 100644
--- a/lib/libc/sys/mount.2
+++ b/lib/libc/sys/mount.2
@@ -159,62 +159,65 @@ struct ufs_args {
 /*
  * Arguments to mount NFS
  */
+
+#define NFS_ARGSVERSION	3		/* change when nfs_args changes */
 struct nfs_args {
-      struct sockaddr_in *addr; /* file server address */
-      int	addrlen;      /* length of address */
-      int	sotype;       /* Socket type */	
-      int	proto;        /* and Protocol */
-      u_char	 *fh;         /* File handle to be mounted */
-      int	fhsize;       /* Size, in bytes, of fh */
-      int       flags;        /* flags */
-      int       wsize;        /* write size in bytes */
-      int       rsize;        /* read size in bytes */
-      int	readdirsize;  /* readdir size in bytes */
-      int       timeo;        /* initial timeout .1 secs */
-      int       retrans;      /* times to retry send */
-      int	maxgrouplist; /* Max. size of group list */
-      int	readahead;    /* # of blocks to readahead */
-      int	leaseterm;    /* Term (sec) of lease */
-      int	deadthreash;  /* Retrans threshold */
-      char      *hostname;    /* server's name */
+	int		version;	/* args structure version number */
+	struct sockaddr	*addr;		/* file server address */
+	int		addrlen;	/* length of address */
+	int		sotype;		/* Socket type */
+	int		proto;		/* and Protocol */
+	u_char		*fh;		/* File handle to be mounted */
+	int		fhsize;		/* Size, in bytes, of fh */
+	int		flags;		/* flags */
+	int		wsize;		/* write size in bytes */
+	int		rsize;		/* read size in bytes */
+	int		readdirsize;	/* readdir size in bytes */
+	int		timeo;		/* initial timeout in .1 secs */
+	int		retrans;	/* times to retry send */
+	int		maxgrouplist;	/* Max. size of group list */
+	int		readahead;	/* # of blocks to readahead */
+	int		leaseterm;	/* Term (sec) of lease */
+	int		deadthresh;	/* Retrans threshold */
+	char		*hostname;	/* server's name */
 };
 
 /*
  * NFS mount option flags
  */
-#define	NFSMNT_SOFT	   0x00000001  /* soft mount (hard is default) */
-#define	NFSMNT_WSIZE	   0x00000002  /* set write size */
-#define	NFSMNT_RSIZE	   0x00000004  /* set read size */
-#define	NFSMNT_TIMEO	   0x00000008  /* set initial timeout */
-#define	NFSMNT_RETRANS	   0x00000010  /* set number of request retrys */
-#define	NFSMNT_MAXGRPS	   0x00000020  /* set maximum grouplist size */
-#define	NFSMNT_INT	   0x00000040  /* allow interrupts on hard mount */
-#define	NFSMNT_NOCONN	   0x00000080  /* Don't Connect the socket */
-#define	NFSMNT_NQNFS	   0x00000100  /* Use Nqnfs protocol */
-#define	NFSMNT_NFSV3	   0x00000200  /* Use NFS Version 3 protocol */
-#define	NFSMNT_KERB	   0x00000400  /* Use Kerberos authentication */
-#define	NFSMNT_DUMBTIMR	   0x00000800  /* Don't estimate rtt dynamically */
-#define	NFSMNT_LEASETERM   0x00001000  /* set lease term (nqnfs) */
-#define	NFSMNT_READAHEAD   0x00002000  /* set read ahead */
-#define	NFSMNT_DEADTHRESH  0x00004000  /* set dead server retry thresh */
-#define	NFSMNT_RESVPORT	   0x00008000  /* Allocate a reserved port */
-#define NFSMNT_RDIRPLUS	   0x00010000  /* Use Readdirplus for V3 */
-#define NFSMNT_READDIRSIZE 0x00020000  /* Set readdir size */
-#define	NFSMNT_INTERNAL	   0xfffc0000  /* Bits set internally */
-#define NFSMNT_HASWRITEVERF 0x00040000  /* Has write verifier for V3 */
-#define NFSMNT_GOTPATHCONF 0x00080000  /* Got the V3 pathconf info */
-#define NFSMNT_GOTFSINFO   0x00100000  /* Got the V3 fsinfo */
-#define	NFSMNT_MNTD	   0x00200000  /* Mnt server for mnt point */
-#define	NFSMNT_DISMINPROG  0x00400000  /* Dismount in progress */
-#define	NFSMNT_DISMNT	   0x00800000  /* Dismounted */
-#define	NFSMNT_SNDLOCK	   0x01000000  /* Send socket lock */
-#define	NFSMNT_WANTSND	   0x02000000  /* Want above */
-#define	NFSMNT_RCVLOCK	   0x04000000  /* Rcv socket lock */
-#define	NFSMNT_WANTRCV	   0x08000000  /* Want above */
-#define	NFSMNT_WAITAUTH	   0x10000000  /* Wait for authentication */
-#define	NFSMNT_HASAUTH	   0x20000000  /* Has authenticator */
-#define	NFSMNT_WANTAUTH	   0x40000000  /* Wants an authenticator */
-#define	NFSMNT_AUTHERR	   0x80000000  /* Authentication error */
+#define	NFSMNT_SOFT		0x00000001  /* soft mount (hard is default) */
+#define	NFSMNT_WSIZE		0x00000002  /* set write size */
+#define	NFSMNT_RSIZE		0x00000004  /* set read size */
+#define	NFSMNT_TIMEO		0x00000008  /* set initial timeout */
+#define	NFSMNT_RETRANS		0x00000010  /* set number of request retries */
+#define	NFSMNT_MAXGRPS		0x00000020  /* set maximum grouplist size */
+#define	NFSMNT_INT		0x00000040  /* allow interrupts on hard mount */
+#define	NFSMNT_NOCONN		0x00000080  /* Don't Connect the socket */
+#define	NFSMNT_NQNFS		0x00000100  /* Use Nqnfs protocol */
+#define	NFSMNT_NFSV3		0x00000200  /* Use NFS Version 3 protocol */
+#define	NFSMNT_KERB		0x00000400  /* Use Kerberos authentication */
+#define	NFSMNT_DUMBTIMR		0x00000800  /* Don't estimate rtt dynamically */
+#define	NFSMNT_LEASETERM	0x00001000  /* set lease term (nqnfs) */
+#define	NFSMNT_READAHEAD	0x00002000  /* set read ahead */
+#define	NFSMNT_DEADTHRESH	0x00004000  /* set dead server retry thresh */
+#define	NFSMNT_RESVPORT		0x00008000  /* Allocate a reserved port */
+#define	NFSMNT_RDIRPLUS		0x00010000  /* Use Readdirplus for V3 */
+#define	NFSMNT_READDIRSIZE	0x00020000  /* Set readdir size */
+#define	NFSMNT_INTERNAL		0xfffc0000  /* Bits set internally */
+#define NFSMNT_HASWRITEVERF	0x00040000  /* Has write verifier for V3 */
+#define NFSMNT_GOTPATHCONF	0x00080000  /* Got the V3 pathconf info */
+#define NFSMNT_GOTFSINFO	0x00100000  /* Got the V3 fsinfo */
+#define	NFSMNT_MNTD		0x00200000  /* Mnt server for mnt point */
+#define	NFSMNT_DISMINPROG	0x00400000  /* Dismount in progress */
+#define	NFSMNT_DISMNT		0x00800000  /* Dismounted */
+#define	NFSMNT_SNDLOCK		0x01000000  /* Send socket lock */
+#define	NFSMNT_WANTSND		0x02000000  /* Want above */
+#define	NFSMNT_RCVLOCK		0x04000000  /* Rcv socket lock */
+#define	NFSMNT_WANTRCV		0x08000000  /* Want above */
+#define	NFSMNT_WAITAUTH		0x10000000  /* Wait for authentication */
+#define	NFSMNT_HASAUTH		0x20000000  /* Has authenticator */
+#define	NFSMNT_WANTAUTH		0x40000000  /* Wants an authenticator */
+#define	NFSMNT_AUTHERR		0x80000000  /* Authentication error */
 #endif /* NFS */
 .Ed
 .Pp