Index: mount.h
===================================================================
RCS file: /space2/ncvs/src/sys/sys/mount.h,v
retrieving revision 1.141
diff -u -p -r1.141 mount.h
--- mount.h	14 Oct 2002 17:18:27 -0000	1.141
+++ mount.h	4 Nov 2002 22:34:19 -0000
@@ -73,13 +73,8 @@ struct fid {
  * filesystem statistics
  */
 
-#define MFSNAMELEN	16	/* length of fs type name, including null */
-#if defined(__i386__) || defined(__powerpc__)
-#define	MNAMELEN	80	/* length of buffer for returned name */
-#endif
-#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__)
-#define	MNAMELEN	72	/* length of buffer for returned name */
-#endif
+#define	MFSNAMELEN	16	/* length of fs type name, including null */
+#define	MNAMELEN	(88 - 2 * sizeof(long))	/* size of on/from name bufs */
 
 struct statfs {
 	long	f_spare2;		/* placeholder */
Index: vfs_mount.c
===================================================================
RCS file: /space/ncvs/src/sys/kern/vfs_mount.c,v
retrieving revision 1.89
diff -u -p -r1.89 vfs_mount.c
--- vfs_mount.c	25 Oct 2002 18:44:42 -0000	1.89
+++ vfs_mount.c	4 Nov 2002 22:51:45 -0000
@@ -1498,7 +1498,7 @@ vfs_mountroot_try(char *mountfrom)
 	vfsname = malloc(MFSNAMELEN, M_MOUNT, M_WAITOK);
 	path = malloc(MNAMELEN, M_MOUNT, M_WAITOK);
 	vfsname[0] = path[0] = 0;
-	sprintf(patt, "%%%d[a-z0-9]:%%%ds", MFSNAMELEN, MNAMELEN);
+	sprintf(patt, "%%%d[a-z0-9]:%%%zds", MFSNAMELEN, MNAMELEN);
 	if (sscanf(mountfrom, patt, vfsname, path) < 1)
 		goto done;