From NetBSD: NFSv3 import (tomorrow's Net's kernel)

Open's patches kept in. i'll possibly take a look at Lite2 soon,
is there smth usefull ?..

1 files changed, 40 insertions, 22 deletions

diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h
index 14c64adb710..12cae0aef94 100644
--- a/sys/nfs/nfsmount.h
+++ b/sys/nfs/nfsmount.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: nfsmount.h,v 1.2 1996/02/29 09:25:03 niklas Exp $	*/
-/*	$NetBSD: nfsmount.h,v 1.9 1996/02/09 21:48:44 christos Exp $	*/
+/*	$OpenBSD: nfsmount.h,v 1.3 1996/03/31 13:16:12 mickey Exp $	*/
+/*	$NetBSD: nfsmount.h,v 1.10 1996/02/18 11:54:03 fvdl Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -36,9 +36,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)nfsmount.h	8.2 (Berkeley) 8/18/94
+ *	@(#)nfsmount.h	8.3 (Berkeley) 3/30/95
  */
 
+
+#ifndef _NFS_NFSMOUNT_H_
+#define _NFS_NFSMOUNT_H_
+
 /*
  * Mount structure.
  * One allocated on every NFS mount.
@@ -48,7 +52,8 @@ struct	nfsmount {
 	int	nm_flag;		/* Flags for soft/hard... */
 	struct	mount *nm_mountp;	/* Vfs structure for this filesystem */
 	int	nm_numgrps;		/* Max. size of groupslist */
-	nfsv2fh_t nm_fh;		/* File handle of root dir */
+	u_char	nm_fh[NFSX_V3FHMAX];	/* File handle of root dir */
+	int	nm_fhsize;		/* Size of root file handle */
 	struct	socket *nm_so;		/* Rpc socket */
 	int	nm_sotype;		/* Type of socket */
 	int	nm_soproto;		/* and protocol */
@@ -64,6 +69,7 @@ struct	nfsmount {
 	int	nm_deadthresh;		/* Threshold of timeouts-->dead server*/
 	int	nm_rsize;		/* Max size of read rpc */
 	int	nm_wsize;		/* Max size of write rpc */
+	int	nm_readdirsize;		/* Size of a readdir rpc */
 	int	nm_readahead;		/* Num. of blocks to readahead */
 	int	nm_leaseterm;		/* Term (sec) for NQNFS lease */
 	CIRCLEQ_HEAD(, nfsnode) nm_timerhead; /* Head of lease timer queue */
@@ -72,6 +78,13 @@ struct	nfsmount {
 	int	nm_authtype;		/* Authenticator type */
 	int	nm_authlen;		/* and length */
 	char	*nm_authstr;		/* Authenticator string */
+	char	*nm_verfstr;		/* and the verifier */
+	int	nm_verflen;
+	u_char	nm_verf[NFSX_V3WRITEVERF]; /* V3 write verifier */
+	NFSKERBKEY_T nm_key;		/* and the session key */
+	int	nm_numuids;		/* Number of nfsuid mappings */
+	TAILQ_HEAD(, nfsuid) nm_uidlruhead; /* Lists of nfsuid mappings */
+	LIST_HEAD(, nfsuid) nm_uidhashtbl[NFS_MUIDHASHSIZ];
 };
 
 #ifdef _KERNEL
@@ -79,26 +92,31 @@ struct	nfsmount {
  * Convert mount ptr to nfsmount ptr.
  */
 #define VFSTONFS(mp)	((struct nfsmount *)((mp)->mnt_data))
+#endif /* _KERNEL */
 
 /*
  * Prototypes for NFS mount operations
  */
-int nfs_statfs __P((struct mount *, struct statfs *, struct proc *));
-int nfs_mountroot __P((void));
-void nfs_decode_args __P((struct nfsmount *, struct nfs_args *));
-int nfs_mount __P((struct mount *, char *, caddr_t, struct nameidata *,
-		   struct proc *));
-int mountnfs __P((struct nfs_args *, struct mount *, struct mbuf *, char *,
-		  char *, struct vnode **));
-int nfs_unmount __P((struct mount *, int, struct proc *));
-int nfs_root __P((struct mount *, struct vnode **));
-int nfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
-int nfs_vget __P((struct mount *, ino_t, struct vnode **));
-int nfs_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
-		    struct vnode **, int *, struct ucred **));
-int nfs_vptofh __P((struct vnode *, struct fid *));
-int nfs_start __P((struct mount *, int, struct proc *));
-int nfs_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
-void nfs_init __P((void));
+int	nfs_mount __P((struct mount *mp, char *path, caddr_t data,
+		struct nameidata *ndp, struct proc *p));
+int	mountnfs __P((struct nfs_args *argp, struct mount *mp,
+		struct mbuf *nam, char *pth, char *hst, struct vnode **vpp));
+int	nfs_mountroot __P((void));
+void	nfs_decode_args __P((struct nfsmount *, struct nfs_args *));
+int	nfs_start __P((struct mount *mp, int flags, struct proc *p));
+int	nfs_unmount __P((struct mount *mp, int mntflags, struct proc *p));
+int	nfs_root __P((struct mount *mp, struct vnode **vpp));
+int	nfs_quotactl __P((struct mount *mp, int cmds, uid_t uid, caddr_t arg,
+		struct proc *p));
+int	nfs_statfs __P((struct mount *mp, struct statfs *sbp, struct proc *p));
+int	nfs_sync __P((struct mount *mp, int waitfor, struct ucred *cred,
+		struct proc *p));
+int	nfs_vget __P((struct mount *, ino_t, struct vnode **));
+int	nfs_fhtovp __P((struct mount *mp, struct fid *fhp, struct mbuf *nam,
+		struct vnode **vpp, int *exflagsp, struct ucred **credanonp));
+int	nfs_vptofh __P((struct vnode *vp, struct fid *fhp));
+int	nfs_fsinfo __P((struct nfsmount *, struct vnode *, struct ucred *,
+			struct proc *));
+void	nfs_init __P((void));
 
-#endif /* _KERNEL */
+#endif