Index: conf/files
===================================================================
RCS file: /u/open/cvs/src/sys/conf/files,v
retrieving revision 1.269
diff -u -r1.269 files
--- conf/files	24 Feb 2003 01:17:36 -0000	1.269
+++ conf/files	27 Jun 2003 16:55:45 -0000
@@ -769,17 +769,31 @@
 file netipx/ipx_cksum.c			ipx
 file netipx/spx_debug.c			ipx
 file netipx/spx_usrreq.c		ipx
-file nfs/krpc_subr.c			nfsclient
-file nfs/nfs_bio.c			nfsclient
-file nfs/nfs_boot.c			nfsclient
-file nfs/nfs_node.c			nfsclient
-file nfs/nfs_serv.c			nfsserver
-file nfs/nfs_socket.c			nfsserver | nfsclient
-file nfs/nfs_srvcache.c			nfsserver
-file nfs/nfs_subs.c			nfsserver | nfsclient
-file nfs/nfs_syscalls.c			nfsserver | nfsclient
-file nfs/nfs_vfsops.c			nfsclient
-file nfs/nfs_vnops.c			nfsclient
+#file nfs/krpc_subr.c			nfsclient
+#file nfs/nfs_bio.c			nfsclient
+#file nfs/nfs_boot.c			nfsclient
+#file nfs/nfs_node.c			nfsclient
+#file nfs/nfs_serv.c			nfsserver
+#file nfs/nfs_socket.c			nfsserver | nfsclient
+#file nfs/nfs_srvcache.c			nfsserver
+#file nfs/nfs_subs.c			nfsserver | nfsclient
+#file nfs/nfs_syscalls.c			nfsserver | nfsclient
+#file nfs/nfs_vfsops.c			nfsclient
+#file nfs/nfs_vnops.c			nfsclient
+file rpc/rpcclnt.c			nfsv4client
+file rpc/rpc_pmap.c			nfsv4client
+file nfs4/nfs4_gss.c			nfsv4server | nfsv4client
+file nfs4/nfs4_socket.c			nfsv4server | nfsv4client
+file nfs4/nfs4_subs.c			nfsv4server | nfsv4client
+file nfs4/nfs4_syscalls.c		nfsv4server | nfsv4client
+file nfs4/nfs4_util.c			nfsv4server | nfsv4client
+file nfs4fs/nfs4fs_decode.c		nfsv4client
+file nfs4fs/nfs4fs_encode.c		nfsv4client
+file nfs4fs/nfs4_bio.c			nfsv4client
+file nfs4fs/nfs4_node.c			nfsv4client
+file nfs4fs/nfs4_proc.c			nfsv4client
+file nfs4fs/nfs4_vfsops.c		nfsv4client
+file nfs4fs/nfs4_vnops.c		nfsv4client
 file ufs/ffs/ffs_alloc.c		ffs | mfs
 file ufs/ffs/ffs_balloc.c		ffs | mfs
 file ufs/ffs/ffs_inode.c		ffs | mfs
Index: nfs/nfs.h
===================================================================
RCS file: /u/open/cvs/src/sys/nfs/nfs.h,v
retrieving revision 1.18
diff -u -r1.18 nfs.h
--- nfs/nfs.h	29 Oct 2002 12:47:06 -0000	1.18
+++ nfs/nfs.h	27 Jun 2003 16:55:45 -0000
@@ -266,8 +266,12 @@
 	struct mbuf	*r_mrep;
 	struct mbuf	*r_md;
 	caddr_t		r_dpos;
+#ifdef NFSV4
+	struct nfs4mount *r_nmp;
+#else
 	struct nfsmount *r_nmp;
 	struct vnode	*r_vp;
+#endif
 	u_int32_t	r_xid;
 	int		r_flags;	/* flags on request, see below */
 	int		r_retry;	/* max retransmission count */
