diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index a2fac0672d0f..ec0d530188dd 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.36 1998/05/24 14:41:47 peter Exp $
+ * $Id: nfs.h,v 1.37 1998/05/31 17:27:45 peter Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -640,7 +640,7 @@ void	nfsrv_cleancache __P((void));
 int	nfs_connect __P((struct nfsmount *, struct nfsreq *));
 void	nfs_disconnect __P((struct nfsmount *));
 int	nfs_getattrcache __P((struct vnode *, struct vattr *));
-int	nfsm_strtmbuf __P((struct mbuf **, char **, char *, long));
+int	nfsm_strtmbuf __P((struct mbuf **, char **, const char *, long));
 int	nfs_bioread __P((struct vnode *, struct uio *, int, struct ucred *,
 			 int));
 int	nfsm_uiotombuf __P((struct uio *, struct mbuf **, int, caddr_t *));
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 27cece459435..dcc64b03e2b0 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.55 1998/05/24 14:41:53 peter Exp $
+ * $Id: nfs_subs.c,v 1.56 1998/05/31 17:27:50 peter Exp $
  */
 
 /*
@@ -1031,7 +1031,7 @@ int
 nfsm_strtmbuf(mb, bpos, cp, siz)
 	struct mbuf **mb;
 	char **bpos;
-	char *cp;
+	const char *cp;
 	long siz;
 {
 	register struct mbuf *m1 = 0, *m2;
diff --git a/sys/nfs/nfs_common.h b/sys/nfs/nfs_common.h
index c8176c98b0b9..d6bdc632bb0d 100644
--- a/sys/nfs/nfs_common.h
+++ b/sys/nfs/nfs_common.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsm_subs.h,v 1.16 1998/05/16 15:11:24 bde Exp $
+ * $Id: nfsm_subs.h,v 1.17 1998/05/31 17:27:57 peter Exp $
  */
 
 
@@ -317,7 +317,7 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 			nfsm_build(tl,u_long *,t2); \
 			*tl++ = txdr_unsigned(s); \
 			*(tl+((t2>>2)-2)) = 0; \
-			bcopy((caddr_t)(a), (caddr_t)tl, (s)); \
+			bcopy((const char *)(a), (caddr_t)tl, (s)); \
 		} else if ((t2 = nfsm_strtmbuf(&mb, &bpos, (a), (s))) != 0) { \
 			error = t2; \
 			m_freem(mreq); \
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 27cece459435..dcc64b03e2b0 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.55 1998/05/24 14:41:53 peter Exp $
+ * $Id: nfs_subs.c,v 1.56 1998/05/31 17:27:50 peter Exp $
  */
 
 /*
@@ -1031,7 +1031,7 @@ int
 nfsm_strtmbuf(mb, bpos, cp, siz)
 	struct mbuf **mb;
 	char **bpos;
-	char *cp;
+	const char *cp;
 	long siz;
 {
 	register struct mbuf *m1 = 0, *m2;
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 0062ce4496de..96b5762968ae 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.91 1998/05/31 01:03:07 peter Exp $
+ * $Id: nfs_vnops.c,v 1.92 1998/05/31 17:27:55 peter Exp $
  */
 
 
@@ -122,7 +122,8 @@ static	int	nfs_symlink __P((struct vop_symlink_args *));
 static	int	nfs_readdir __P((struct vop_readdir_args *));
 static	int	nfs_bmap __P((struct vop_bmap_args *));
 static	int	nfs_strategy __P((struct vop_strategy_args *));
-static	int	nfs_lookitup __P((struct vnode *,char *,int,struct ucred *,struct proc *,struct nfsnode **));
+static	int	nfs_lookitup __P((struct vnode *, const char *, int,
+			struct ucred *, struct proc *, struct nfsnode **));
 static	int	nfs_sillyrename __P((struct vnode *,struct vnode *,struct componentname *));
 static int	nfsspec_access __P((struct vop_access_args *));
 static int	nfs_readlink __P((struct vop_readlink_args *));
@@ -222,11 +223,12 @@ static int	nfs_commit __P((struct vnode *vp, u_quad_t offset, int cnt,
 static int	nfs_mknodrpc __P((struct vnode *dvp, struct vnode **vpp,
 				  struct componentname *cnp,
 				  struct vattr *vap));
-static int	nfs_removerpc __P((struct vnode *dvp, char *name, int namelen,
+static int	nfs_removerpc __P((struct vnode *dvp, const char *name,
+				   int namelen,
 				   struct ucred *cred, struct proc *proc));
-static int	nfs_renamerpc __P((struct vnode *fdvp, char *fnameptr,
+static int	nfs_renamerpc __P((struct vnode *fdvp, const char *fnameptr,
 				   int fnamelen, struct vnode *tdvp,
-				   char *tnameptr, int tnamelen,
+				   const char *tnameptr, int tnamelen,
 				   struct ucred *cred, struct proc *proc));
 static int	nfs_renameit __P((struct vnode *sdvp,
 				  struct componentname *scnp,
@@ -1496,7 +1498,7 @@ nfs_removeit(sp)
 static int
 nfs_removerpc(dvp, name, namelen, cred, proc)
 	register struct vnode *dvp;
-	char *name;
+	const char *name;
 	int namelen;
 	struct ucred *cred;
 	struct proc *proc;
@@ -1614,10 +1616,10 @@ nfs_renameit(sdvp, scnp, sp)
 static int
 nfs_renamerpc(fdvp, fnameptr, fnamelen, tdvp, tnameptr, tnamelen, cred, proc)
 	register struct vnode *fdvp;
-	char *fnameptr;
+	const char *fnameptr;
 	int fnamelen;
 	register struct vnode *tdvp;
-	char *tnameptr;
+	const char *tnameptr;
 	int tnamelen;
 	struct ucred *cred;
 	struct proc *proc;
@@ -2448,7 +2450,7 @@ bad:
 static int
 nfs_lookitup(dvp, name, len, cred, procp, npp)
 	register struct vnode *dvp;
-	char *name;
+	const char *name;
 	int len;
 	struct ucred *cred;
 	struct proc *procp;
diff --git a/sys/nfs/nfsm_subs.h b/sys/nfs/nfsm_subs.h
index c8176c98b0b9..d6bdc632bb0d 100644
--- a/sys/nfs/nfsm_subs.h
+++ b/sys/nfs/nfsm_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsm_subs.h,v 1.16 1998/05/16 15:11:24 bde Exp $
+ * $Id: nfsm_subs.h,v 1.17 1998/05/31 17:27:57 peter Exp $
  */
 
 
@@ -317,7 +317,7 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 			nfsm_build(tl,u_long *,t2); \
 			*tl++ = txdr_unsigned(s); \
 			*(tl+((t2>>2)-2)) = 0; \
-			bcopy((caddr_t)(a), (caddr_t)tl, (s)); \
+			bcopy((const char *)(a), (caddr_t)tl, (s)); \
 		} else if ((t2 = nfsm_strtmbuf(&mb, &bpos, (a), (s))) != 0) { \
 			error = t2; \
 			m_freem(mreq); \
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index a2fac0672d0f..ec0d530188dd 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.36 1998/05/24 14:41:47 peter Exp $
+ * $Id: nfs.h,v 1.37 1998/05/31 17:27:45 peter Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -640,7 +640,7 @@ void	nfsrv_cleancache __P((void));
 int	nfs_connect __P((struct nfsmount *, struct nfsreq *));
 void	nfs_disconnect __P((struct nfsmount *));
 int	nfs_getattrcache __P((struct vnode *, struct vattr *));
-int	nfsm_strtmbuf __P((struct mbuf **, char **, char *, long));
+int	nfsm_strtmbuf __P((struct mbuf **, char **, const char *, long));
 int	nfs_bioread __P((struct vnode *, struct uio *, int, struct ucred *,
 			 int));
 int	nfsm_uiotombuf __P((struct uio *, struct mbuf **, int, caddr_t *));
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 27cece459435..dcc64b03e2b0 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.55 1998/05/24 14:41:53 peter Exp $
+ * $Id: nfs_subs.c,v 1.56 1998/05/31 17:27:50 peter Exp $
  */
 
 /*
@@ -1031,7 +1031,7 @@ int
 nfsm_strtmbuf(mb, bpos, cp, siz)
 	struct mbuf **mb;
 	char **bpos;
-	char *cp;
+	const char *cp;
 	long siz;
 {
 	register struct mbuf *m1 = 0, *m2;
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 0062ce4496de..96b5762968ae 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.91 1998/05/31 01:03:07 peter Exp $
+ * $Id: nfs_vnops.c,v 1.92 1998/05/31 17:27:55 peter Exp $
  */
 
 
@@ -122,7 +122,8 @@ static	int	nfs_symlink __P((struct vop_symlink_args *));
 static	int	nfs_readdir __P((struct vop_readdir_args *));
 static	int	nfs_bmap __P((struct vop_bmap_args *));
 static	int	nfs_strategy __P((struct vop_strategy_args *));
-static	int	nfs_lookitup __P((struct vnode *,char *,int,struct ucred *,struct proc *,struct nfsnode **));
+static	int	nfs_lookitup __P((struct vnode *, const char *, int,
+			struct ucred *, struct proc *, struct nfsnode **));
 static	int	nfs_sillyrename __P((struct vnode *,struct vnode *,struct componentname *));
 static int	nfsspec_access __P((struct vop_access_args *));
 static int	nfs_readlink __P((struct vop_readlink_args *));
@@ -222,11 +223,12 @@ static int	nfs_commit __P((struct vnode *vp, u_quad_t offset, int cnt,
 static int	nfs_mknodrpc __P((struct vnode *dvp, struct vnode **vpp,
 				  struct componentname *cnp,
 				  struct vattr *vap));
-static int	nfs_removerpc __P((struct vnode *dvp, char *name, int namelen,
+static int	nfs_removerpc __P((struct vnode *dvp, const char *name,
+				   int namelen,
 				   struct ucred *cred, struct proc *proc));
-static int	nfs_renamerpc __P((struct vnode *fdvp, char *fnameptr,
+static int	nfs_renamerpc __P((struct vnode *fdvp, const char *fnameptr,
 				   int fnamelen, struct vnode *tdvp,
-				   char *tnameptr, int tnamelen,
+				   const char *tnameptr, int tnamelen,
 				   struct ucred *cred, struct proc *proc));
 static int	nfs_renameit __P((struct vnode *sdvp,
 				  struct componentname *scnp,
@@ -1496,7 +1498,7 @@ nfs_removeit(sp)
 static int
 nfs_removerpc(dvp, name, namelen, cred, proc)
 	register struct vnode *dvp;
-	char *name;
+	const char *name;
 	int namelen;
 	struct ucred *cred;
 	struct proc *proc;
@@ -1614,10 +1616,10 @@ nfs_renameit(sdvp, scnp, sp)
 static int
 nfs_renamerpc(fdvp, fnameptr, fnamelen, tdvp, tnameptr, tnamelen, cred, proc)
 	register struct vnode *fdvp;
-	char *fnameptr;
+	const char *fnameptr;
 	int fnamelen;
 	register struct vnode *tdvp;
-	char *tnameptr;
+	const char *tnameptr;
 	int tnamelen;
 	struct ucred *cred;
 	struct proc *proc;
@@ -2448,7 +2450,7 @@ bad:
 static int
 nfs_lookitup(dvp, name, len, cred, procp, npp)
 	register struct vnode *dvp;
-	char *name;
+	const char *name;
 	int len;
 	struct ucred *cred;
 	struct proc *procp;
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index a2fac0672d0f..ec0d530188dd 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.36 1998/05/24 14:41:47 peter Exp $
+ * $Id: nfs.h,v 1.37 1998/05/31 17:27:45 peter Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -640,7 +640,7 @@ void	nfsrv_cleancache __P((void));
 int	nfs_connect __P((struct nfsmount *, struct nfsreq *));
 void	nfs_disconnect __P((struct nfsmount *));
 int	nfs_getattrcache __P((struct vnode *, struct vattr *));
-int	nfsm_strtmbuf __P((struct mbuf **, char **, char *, long));
+int	nfsm_strtmbuf __P((struct mbuf **, char **, const char *, long));
 int	nfs_bioread __P((struct vnode *, struct uio *, int, struct ucred *,
 			 int));
 int	nfsm_uiotombuf __P((struct uio *, struct mbuf **, int, caddr_t *));
diff --git a/sys/nfsclient/nfsm_subs.h b/sys/nfsclient/nfsm_subs.h
index c8176c98b0b9..d6bdc632bb0d 100644
--- a/sys/nfsclient/nfsm_subs.h
+++ b/sys/nfsclient/nfsm_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsm_subs.h,v 1.16 1998/05/16 15:11:24 bde Exp $
+ * $Id: nfsm_subs.h,v 1.17 1998/05/31 17:27:57 peter Exp $
  */
 
 
@@ -317,7 +317,7 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 			nfsm_build(tl,u_long *,t2); \
 			*tl++ = txdr_unsigned(s); \
 			*(tl+((t2>>2)-2)) = 0; \
-			bcopy((caddr_t)(a), (caddr_t)tl, (s)); \
+			bcopy((const char *)(a), (caddr_t)tl, (s)); \
 		} else if ((t2 = nfsm_strtmbuf(&mb, &bpos, (a), (s))) != 0) { \
 			error = t2; \
 			m_freem(mreq); \
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index a2fac0672d0f..ec0d530188dd 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.36 1998/05/24 14:41:47 peter Exp $
+ * $Id: nfs.h,v 1.37 1998/05/31 17:27:45 peter Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -640,7 +640,7 @@ void	nfsrv_cleancache __P((void));
 int	nfs_connect __P((struct nfsmount *, struct nfsreq *));
 void	nfs_disconnect __P((struct nfsmount *));
 int	nfs_getattrcache __P((struct vnode *, struct vattr *));
-int	nfsm_strtmbuf __P((struct mbuf **, char **, char *, long));
+int	nfsm_strtmbuf __P((struct mbuf **, char **, const char *, long));
 int	nfs_bioread __P((struct vnode *, struct uio *, int, struct ucred *,
 			 int));
 int	nfsm_uiotombuf __P((struct uio *, struct mbuf **, int, caddr_t *));
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index a2fac0672d0f..ec0d530188dd 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.36 1998/05/24 14:41:47 peter Exp $
+ * $Id: nfs.h,v 1.37 1998/05/31 17:27:45 peter Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -640,7 +640,7 @@ void	nfsrv_cleancache __P((void));
 int	nfs_connect __P((struct nfsmount *, struct nfsreq *));
 void	nfs_disconnect __P((struct nfsmount *));
 int	nfs_getattrcache __P((struct vnode *, struct vattr *));
-int	nfsm_strtmbuf __P((struct mbuf **, char **, char *, long));
+int	nfsm_strtmbuf __P((struct mbuf **, char **, const char *, long));
 int	nfs_bioread __P((struct vnode *, struct uio *, int, struct ucred *,
 			 int));
 int	nfsm_uiotombuf __P((struct uio *, struct mbuf **, int, caddr_t *));
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 27cece459435..dcc64b03e2b0 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.55 1998/05/24 14:41:53 peter Exp $
+ * $Id: nfs_subs.c,v 1.56 1998/05/31 17:27:50 peter Exp $
  */
 
 /*
@@ -1031,7 +1031,7 @@ int
 nfsm_strtmbuf(mb, bpos, cp, siz)
 	struct mbuf **mb;
 	char **bpos;
-	char *cp;
+	const char *cp;
 	long siz;
 {
 	register struct mbuf *m1 = 0, *m2;
diff --git a/sys/nfsserver/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h
index c8176c98b0b9..d6bdc632bb0d 100644
--- a/sys/nfsserver/nfsm_subs.h
+++ b/sys/nfsserver/nfsm_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsm_subs.h,v 1.16 1998/05/16 15:11:24 bde Exp $
+ * $Id: nfsm_subs.h,v 1.17 1998/05/31 17:27:57 peter Exp $
  */
 
 
@@ -317,7 +317,7 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 			nfsm_build(tl,u_long *,t2); \
 			*tl++ = txdr_unsigned(s); \
 			*(tl+((t2>>2)-2)) = 0; \
-			bcopy((caddr_t)(a), (caddr_t)tl, (s)); \
+			bcopy((const char *)(a), (caddr_t)tl, (s)); \
 		} else if ((t2 = nfsm_strtmbuf(&mb, &bpos, (a), (s))) != 0) { \
 			error = t2; \
 			m_freem(mreq); \
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index a2fac0672d0f..ec0d530188dd 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.36 1998/05/24 14:41:47 peter Exp $
+ * $Id: nfs.h,v 1.37 1998/05/31 17:27:45 peter Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -640,7 +640,7 @@ void	nfsrv_cleancache __P((void));
 int	nfs_connect __P((struct nfsmount *, struct nfsreq *));
 void	nfs_disconnect __P((struct nfsmount *));
 int	nfs_getattrcache __P((struct vnode *, struct vattr *));
-int	nfsm_strtmbuf __P((struct mbuf **, char **, char *, long));
+int	nfsm_strtmbuf __P((struct mbuf **, char **, const char *, long));
 int	nfs_bioread __P((struct vnode *, struct uio *, int, struct ucred *,
 			 int));
 int	nfsm_uiotombuf __P((struct uio *, struct mbuf **, int, caddr_t *));