diff -ruN --exclude=CVS -I \$OpenBSD: ../src.vfs/distrib/sets/lists/base/md.alpha ./distrib/sets/lists/base/md.alpha
--- ../src.vfs/distrib/sets/lists/base/md.alpha	Sun Jun  1 17:22:25 2003
+++ ./distrib/sets/lists/base/md.alpha	Sun Jun  1 17:59:01 2003
@@ -1503,6 +1503,10 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/fifofs/fifo.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/genfs
+./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/genfs/genfs.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/genfs/layer.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/kernfs/kernfs.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/miscfs/nullfs
diff -ruN --exclude=CVS -I \$OpenBSD: ../src.vfs/distrib/sets/lists/base/md.hp300 ./distrib/sets/lists/base/md.hp300
--- ../src.vfs/distrib/sets/lists/base/md.hp300	Sun Jun  1 17:22:25 2003
+++ ./distrib/sets/lists/base/md.hp300	Sun Jun  1 17:59:01 2003
@@ -1513,6 +1513,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fifofs/fifo.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs
+./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs/genfs.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs/layer.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/kernfs/kernfs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/nullfs
diff -ruN --exclude=CVS -I \$OpenBSD: ../src.vfs/distrib/sets/lists/base/md.hppa ./distrib/sets/lists/base/md.hppa
--- ../src.vfs/distrib/sets/lists/base/md.hppa	Sun Jun  1 17:22:26 2003
+++ ./distrib/sets/lists/base/md.hppa	Sun Jun  1 17:59:01 2003
@@ -1419,6 +1419,10 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/fifofs/fifo.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/genfs
+./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/genfs/genfs.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/genfs/layer.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/kernfs/kernfs.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/miscfs/nullfs
diff -ruN --exclude=CVS -I \$OpenBSD: ../src.vfs/distrib/sets/lists/base/md.i386 ./distrib/sets/lists/base/md.i386
--- ../src.vfs/distrib/sets/lists/base/md.i386	Sun Jun  1 17:22:26 2003
+++ ./distrib/sets/lists/base/md.i386	Sun Jun  1 17:59:02 2003
@@ -1502,6 +1502,10 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/fifofs/fifo.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/genfs
+./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/genfs/genfs.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/genfs/layer.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/kernfs/kernfs.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/nullfs
diff -ruN --exclude=CVS -I \$OpenBSD: ../src.vfs/distrib/sets/lists/base/md.mac68k ./distrib/sets/lists/base/md.mac68k
--- ../src.vfs/distrib/sets/lists/base/md.mac68k	Sun Jun  1 17:22:26 2003
+++ ./distrib/sets/lists/base/md.mac68k	Sun Jun  1 17:59:02 2003
@@ -1522,6 +1522,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fifofs/fifo.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs
+./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs/genfs.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs/layer.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/kernfs/kernfs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/nullfs
diff -ruN --exclude=CVS -I \$OpenBSD: ../src.vfs/distrib/sets/lists/base/md.macppc ./distrib/sets/lists/base/md.macppc
--- ../src.vfs/distrib/sets/lists/base/md.macppc	Sun Jun  1 17:22:26 2003
+++ ./distrib/sets/lists/base/md.macppc	Sun Jun  1 17:59:02 2003
@@ -1502,6 +1502,10 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fifofs/fifo.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/genfs
+./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/genfs/genfs.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/genfs/layer.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/kernfs/kernfs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/nullfs
diff -ruN --exclude=CVS -I \$OpenBSD: ../src.vfs/distrib/sets/lists/base/md.mvme68k ./distrib/sets/lists/base/md.mvme68k
--- ../src.vfs/distrib/sets/lists/base/md.mvme68k	Sun Jun  1 17:22:26 2003
+++ ./distrib/sets/lists/base/md.mvme68k	Sun Jun  1 17:59:02 2003
@@ -1476,6 +1476,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/fifofs/fifo.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs
+./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs/genfs.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs/layer.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/kernfs/kernfs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/miscfs/nullfs
diff -ruN --exclude=CVS -I \$OpenBSD: ../src.vfs/distrib/sets/lists/base/md.mvmeppc ./distrib/sets/lists/base/md.mvmeppc
--- ../src.vfs/distrib/sets/lists/base/md.mvmeppc	Sun Jun  1 17:22:26 2003
+++ ./distrib/sets/lists/base/md.mvmeppc	Sun Jun  1 17:59:02 2003
@@ -1441,6 +1441,10 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/fifofs/fifo.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/genfs
+./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/genfs/genfs.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/genfs/layer.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/kernfs/kernfs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/miscfs/nullfs
diff -ruN --exclude=CVS -I \$OpenBSD: ../src.vfs/distrib/sets/lists/base/md.sparc ./distrib/sets/lists/base/md.sparc
--- ../src.vfs/distrib/sets/lists/base/md.sparc	Sun Jun  1 17:22:26 2003
+++ ./distrib/sets/lists/base/md.sparc	Sun Jun  1 17:59:02 2003
@@ -938,6 +938,10 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/fifofs/fifo.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/genfs
+./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/genfs/genfs.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/genfs/layer.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/kernfs/kernfs.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/miscfs/nullfs
diff -ruN --exclude=CVS -I \$OpenBSD: ../src.vfs/distrib/sets/lists/base/md.sparc64 ./distrib/sets/lists/base/md.sparc64
--- ../src.vfs/distrib/sets/lists/base/md.sparc64	Sun Jun  1 17:22:26 2003
+++ ./distrib/sets/lists/base/md.sparc64	Sun Jun  1 17:59:02 2003
@@ -939,6 +939,10 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/fifofs/fifo.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/genfs
+./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/genfs/genfs.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/genfs/layer.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/kernfs/kernfs.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/miscfs/nullfs
diff -ruN --exclude=CVS -I \$OpenBSD: ../src.vfs/distrib/sets/lists/base/md.vax ./distrib/sets/lists/base/md.vax
--- ../src.vfs/distrib/sets/lists/base/md.vax	Sun Jun  1 17:22:26 2003
+++ ./distrib/sets/lists/base/md.vax	Sun Jun  1 17:59:02 2003
@@ -876,6 +876,10 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/fdesc/fdesc.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/fifofs
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/fifofs/fifo.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/genfs
+./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/genfs/genfs.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/genfs/layer.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/genfs/layer_extern.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/kernfs
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/kernfs/kernfs.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/nullfs
diff -ruN --exclude=CVS -I \$OpenBSD: ../src.vfs/distrib/sets/lists/comp/mi ./distrib/sets/lists/comp/mi
--- ../src.vfs/distrib/sets/lists/comp/mi	Sun Jun  1 17:22:27 2003
+++ ./distrib/sets/lists/comp/mi	Sun Jun  1 17:59:02 2003
@@ -945,6 +945,9 @@
 ./usr/include/miscfs/fdesc/fdesc.h
 ./usr/include/miscfs/fifofs
 ./usr/include/miscfs/fifofs/fifo.h
+./usr/include/miscfs/genfs/genfs.h
+./usr/include/miscfs/genfs/layer.h
+./usr/include/miscfs/genfs/layer_extern.h
 ./usr/include/miscfs/kernfs
 ./usr/include/miscfs/kernfs/kernfs.h
 ./usr/include/miscfs/nullfs
diff -ruN --exclude=CVS -I \$OpenBSD: ../src.vfs/sbin/mount_null/mount_null.c ./sbin/mount_null/mount_null.c
--- ../src.vfs/sbin/mount_null/mount_null.c	Sun Jun  1 17:26:41 2003
+++ ./sbin/mount_null/mount_null.c	Sun Jun  1 17:59:26 2003
@@ -104,7 +104,7 @@
 		errx(1, "%s (%s) and %s are not distinct paths",
 		    argv[0], target, argv[1]);
 
-	args.target = target;
+	args.la.target = target;
 
 	if (mount(MOUNT_NULL, argv[1], mntflags, &args)) {
 		if (errno == EOPNOTSUPP)
diff -ruN --exclude=CVS -I \$OpenBSD: ../src.vfs/sbin/mount_umap/mount_umap.c ./sbin/mount_umap/mount_umap.c
--- ../src.vfs/sbin/mount_umap/mount_umap.c	Sun Jun  1 17:26:42 2003
+++ ./sbin/mount_umap/mount_umap.c	Sun Jun  1 17:59:26 2003
@@ -51,6 +51,7 @@
 #endif
 #endif /* not lint */
 
+#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
@@ -101,8 +102,8 @@
 	struct umap_args args;
 	FILE *fp, *gfp;
 	long d1, d2;
-	id_t umapdata[UMAPFILEENTRIES][2];
-	id_t gmapdata[GMAPFILEENTRIES][2];
+	u_long umapdata[MAPFILEENTRIES][2];
+	u_long gmapdata[GMAPFILEENTRIES][2];
 	int ch, count, gnentries, mntflags, unentries;
 	char *gmapfile, *umapfile, *source, *target, buf[20];
 
@@ -154,9 +155,9 @@
 
 	if ((fscanf(fp, "%d\n", &unentries)) != 1)
 		errx(1, "%s: nentries not found%s", umapfile, not);
-	if (unentries > UMAPFILEENTRIES)
+	if (unentries > MAPFILEENTRIES)
 		errx(1,
-		    "maximum number of entries is %d%s", UMAPFILEENTRIES, not);
+		    "maximum number of entries is %d%s", MAPFILEENTRIES, not);
 #if 0
 	(void)printf("reading %d entries\n", unentries);
 #endif
@@ -225,9 +226,9 @@
 
 
 	/* Setup mount call args. */
-	args.target = source;
-	args.unentries = unentries;
-	args.umapdata  = umapdata;
+	args.la.target = source;
+	args.nentries = unentries;
+	args.mapdata  = umapdata;
 	args.gnentries = gnentries;
 	args.gmapdata  = gmapdata;
 
diff -ruN --exclude=CVS -I \$OpenBSD: ../src.vfs/usr.bin/fstat/fstat.c ./usr.bin/fstat/fstat.c
--- ../src.vfs/usr.bin/fstat/fstat.c	Sun Jun  1 17:27:49 2003
+++ ./usr.bin/fstat/fstat.c	Sun Jun  1 17:59:35 2003
@@ -59,8 +59,8 @@
 #include <sys/unpcb.h>
 #include <sys/sysctl.h>
 #include <sys/filedesc.h>
-#include <sys/mount.h>
 #define	_KERNEL
+#include <sys/mount.h>
 #include <crypto/cryptodev.h>
 #include <dev/systrace.h>
 #include <sys/file.h>