From: Sascha Wildner Date: Sun, 14 May 2006 18:00:05 +0000 (+0000) Subject: /tmp/umap.msg X-Git-Tag: v2.0.1~4942 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/ccb16a17e68615c9bfe762d26b1d922e6a618e26 /tmp/umap.msg --- diff --git a/etc/Makefile b/etc/Makefile index 61cefcc4cb..17ac0413b9 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,6 +1,6 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $ -# $DragonFly: src/etc/Makefile,v 1.106 2006/04/01 10:06:39 swildner Exp $ +# $DragonFly: src/etc/Makefile,v 1.107 2006/05/14 18:00:04 swildner Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -395,6 +395,9 @@ upgrade_etc: preupgrade csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}9/spl${splman}.9.gz" .endfor rm -f ${DESTDIR}/modules/if_owi.ko + rm -f ${DESTDIR}/modules/umap.ko + rm -f ${DESTDIR}/sbin/mount_umap + csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}8/mount_umap.8.gz" ldconfig -R .if !defined(BINARY_UPGRADE) # binary upgrade just copies these nodes .if !defined(NO_MAKEDEV) diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 index 52ed5f24b4..8ede29a537 100644 --- a/sbin/mount/mount.8 +++ b/sbin/mount/mount.8 @@ -31,7 +31,7 @@ .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 .\" $FreeBSD: src/sbin/mount/mount.8,v 1.31.2.12 2003/02/23 21:17:42 trhodes Exp $ -.\" $DragonFly: src/sbin/mount/mount.8,v 1.4 2006/02/17 19:33:32 swildner Exp $ +.\" $DragonFly: src/sbin/mount/mount.8,v 1.5 2006/05/14 18:00:04 swildner Exp $ .\" .Dd June 16, 1994 .Dt MOUNT 8 @@ -386,7 +386,6 @@ have permission to load the module. .Xr mount_procfs 8 , .Xr mount_smbfs 8 , .Xr mount_std 8 , -.Xr mount_umap 8 , .Xr mount_union 8 , .Xr sysctl 8 , .Xr umount 8 diff --git a/sbin/mount_null/mount_null.8 b/sbin/mount_null/mount_null.8 index ee5e465426..d7f8e8ae52 100644 --- a/sbin/mount_null/mount_null.8 +++ b/sbin/mount_null/mount_null.8 @@ -36,9 +36,9 @@ .\" .\" @(#)mount_null.8 8.6 (Berkeley) 5/1/95 .\" $FreeBSD: src/sbin/mount_null/mount_null.8,v 1.11.2.6 2001/12/20 16:40:00 ru Exp $ -.\" $DragonFly: src/sbin/mount_null/mount_null.8,v 1.3 2006/02/17 19:33:33 swildner Exp $ +.\" $DragonFly: src/sbin/mount_null/mount_null.8,v 1.4 2006/05/14 18:00:04 swildner Exp $ .\" -.Dd May 1, 1995 +.Dd May 14, 2006 .Dt MOUNT_NULL 8 .Os .Sh NAME @@ -193,9 +193,6 @@ then begin modifying the copy. .Xr Sed 1 can be used to easily rename all variables. -.Pp -The umap layer is an example of a layer descended from the -null layer. .\" .\" .Sh INVOKING OPERATIONS ON LOWER LAYERS diff --git a/sys/boot/forth/loader-bootp.conf b/sys/boot/forth/loader-bootp.conf index 0cf76f7f4f..0ed7a8c95a 100644 --- a/sys/boot/forth/loader-bootp.conf +++ b/sys/boot/forth/loader-bootp.conf @@ -7,7 +7,7 @@ # All arguments must be in double quotes. # # $FreeBSD: src/sys/boot/forth/loader.conf,v 1.72 2003/07/01 01:03:32 brueffer Exp $ -# $DragonFly: src/sys/boot/forth/loader-bootp.conf,v 1.5 2005/05/29 23:35:00 swildner Exp $ +# $DragonFly: src/sys/boot/forth/loader-bootp.conf,v 1.6 2006/05/14 18:00:04 swildner Exp $ ############################################################## ### Basic configuration options ############################ @@ -123,7 +123,6 @@ ntfs_load="NO" # NTFS nullfs_load="NO" # Null filesystem portalfs_load="NO" # Portal filesystem procfs_load="NO" # Process filesystem -umapfs_load="NO" # User-id map filesystem unionfs_load="NO" # Union filesystem # Related stuff diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index b2afe4e5cb..ec45d33cdb 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -7,7 +7,7 @@ # All arguments must be in double quotes. # # $FreeBSD: src/sys/boot/forth/loader.conf,v 1.72 2003/07/01 01:03:32 brueffer Exp $ -# $DragonFly: src/sys/boot/forth/loader.conf,v 1.11 2005/05/29 23:35:00 swildner Exp $ +# $DragonFly: src/sys/boot/forth/loader.conf,v 1.12 2006/05/14 18:00:04 swildner Exp $ ############################################################## ### Basic configuration options ############################ @@ -123,7 +123,6 @@ ntfs_load="NO" # NTFS nullfs_load="NO" # Null filesystem portalfs_load="NO" # Portal filesystem procfs_load="NO" # Process filesystem -umapfs_load="NO" # User-id map filesystem unionfs_load="NO" # Union filesystem # Related stuff diff --git a/sys/config/LINT b/sys/config/LINT index ea0c2d09a6..ef0107e7c5 100644 --- a/sys/config/LINT +++ b/sys/config/LINT @@ -3,7 +3,7 @@ # as much of the source tree as it can. # # $FreeBSD: src/sys/i386/conf/LINT,v 1.749.2.144 2003/06/04 17:56:59 sam Exp $ -# $DragonFly: src/sys/config/LINT,v 1.73 2006/05/12 22:07:22 dillon Exp $ +# $DragonFly: src/sys/config/LINT,v 1.74 2006/05/14 18:00:04 swildner Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -725,7 +725,7 @@ options DEVICE_POLLING # currently be demand-loaded.) Some people still prefer to statically # compile other filesystems as well. # -# NB: The NULL, PORTAL, UMAP and UNION filesystems are known to be +# NB: The NULL, PORTAL and UNION filesystems are known to be # buggy, and WILL panic your system if you attempt to do anything with # them. They are included here as an incentive for some enterprising # soul to sit down and fix them. diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 1b25773aae..60e9df6fca 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -3,7 +3,7 @@ # as much of the source tree as it can. # # $FreeBSD: src/sys/i386/conf/LINT,v 1.749.2.144 2003/06/04 17:56:59 sam Exp $ -# $DragonFly: src/sys/i386/conf/Attic/LINT,v 1.73 2006/05/12 22:07:22 dillon Exp $ +# $DragonFly: src/sys/i386/conf/Attic/LINT,v 1.74 2006/05/14 18:00:04 swildner Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -725,7 +725,7 @@ options DEVICE_POLLING # currently be demand-loaded.) Some people still prefer to statically # compile other filesystems as well. # -# NB: The NULL, PORTAL, UMAP and UNION filesystems are known to be +# NB: The NULL, PORTAL and UNION filesystems are known to be # buggy, and WILL panic your system if you attempt to do anything with # them. They are included here as an incentive for some enterprising # soul to sit down and fix them. diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc index 6e7a517f32..6919b38818 100644 --- a/sys/kern/Make.tags.inc +++ b/sys/kern/Make.tags.inc @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/kern/Make.tags.inc,v 1.6.2.2 2003/02/10 12:21:08 des Exp $ -# $DragonFly: src/sys/kern/Make.tags.inc,v 1.6 2004/04/15 21:00:50 drhodus Exp $ +# $DragonFly: src/sys/kern/Make.tags.inc,v 1.7 2006/05/14 18:00:04 swildner Exp $ # @(#)Make.tags.inc 8.1 (Berkeley) 6/11/93 SYS?= /sys @@ -37,7 +37,6 @@ COMM= ${SYS}/conf/*.[ch] \ ${SYS}/vfs/portal/*.[ch] \ ${SYS}/vfs/procfs/*.[ch] \ ${SYS}/vfs/specfs/*.[ch] \ - ${SYS}/vfs/umapfs/*.[ch] \ ${SYS}/vfs/union/*.[ch] \ ${SYS}/vfs/msdosfs/*.[ch] \ ${SYS}/net/*.[ch] \ @@ -90,7 +89,6 @@ COMMDIR2= ${SYS}/dev/disk/advansys \ ${SYS}/vfs/portal \ ${SYS}/vfs/procfs \ ${SYS}/vfs/specfs \ - ${SYS}/vfs/umapfs \ ${SYS}/vfs/union \ ${SYS}/vfs/ufs \ ${SYS}/vfs/mfs diff --git a/sys/kern/Makefile b/sys/kern/Makefile index 8af3d3dbfb..44ebe60c6d 100644 --- a/sys/kern/Makefile +++ b/sys/kern/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.2 (Berkeley) 3/21/94 # $FreeBSD: src/sys/kern/Makefile,v 1.6.2.1 2003/02/10 12:21:08 des Exp $ -# $DragonFly: src/sys/kern/Makefile,v 1.8 2003/08/21 20:08:26 dillon Exp $ +# $DragonFly: src/sys/kern/Makefile,v 1.9 2006/05/14 18:00:04 swildner Exp $ # Makefile for kernel tags files, init_sysent, etc. @@ -26,7 +26,7 @@ DGEN= conf \ kern libkern \ vfs vfs/deadfs vfs/fdesc vfs/fifofs \ vfs/nullfs vfs/portal vfs/procfs \ - vfs/specfs vfs/umapfs vfs/union \ + vfs/specfs vfs/union \ vfs/ufs vfs/mfs vfs/nfs \ net netinet netns sys \ vm diff --git a/sys/kern/Makefile.misc b/sys/kern/Makefile.misc index d18273114f..00ad63b560 100644 --- a/sys/kern/Makefile.misc +++ b/sys/kern/Makefile.misc @@ -1,4 +1,4 @@ -# $DragonFly: src/sys/kern/Makefile.misc,v 1.2 2005/07/07 11:49:57 corecode Exp $ +# $DragonFly: src/sys/kern/Makefile.misc,v 1.3 2006/05/14 18:00:04 swildner Exp $ # # Makefile for kernel tags files, init_sysent, etc. @@ -41,7 +41,7 @@ DGEN= conf \ kern libkern \ vfs vfs/deadfs vfs/fdesc vfs/fifofs \ vfs/nullfs vfs/portal vfs/procfs \ - vfs/specfs vfs/umapfs vfs/union \ + vfs/specfs vfs/union \ vfs/ufs vfs/mfs vfs/nfs \ net netinet netns sys \ vm diff --git a/sys/sys/vfscache.h b/sys/sys/vfscache.h index faa9b40270..fd8dad060b 100644 --- a/sys/sys/vfscache.h +++ b/sys/sys/vfscache.h @@ -63,7 +63,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/sys/vfscache.h,v 1.4 2006/04/04 17:34:31 dillon Exp $ + * $DragonFly: src/sys/sys/vfscache.h,v 1.5 2006/05/14 18:00:04 swildner Exp $ */ /* * This module serves as a focal point for virtually all filesystem and @@ -100,8 +100,8 @@ enum vtype { VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD }; */ enum vtagtype { VT_NON, VT_UFS, VT_NFS, VT_MFS, VT_PC, VT_LFS, VT_LOFS, VT_FDESC, - VT_PORTAL, VT_NULL, VT_UMAP, VT_KERNFS, VT_PROCFS, VT_AFS, VT_ISOFS, - VT_UNION, VT_MSDOSFS, VT_TFS, VT_VFS, VT_CODA, VT_NTFS, + VT_PORTAL, VT_NULL, VT_UNUSED10, VT_KERNFS, VT_PROCFS, VT_AFS, + VT_ISOFS, VT_UNION, VT_MSDOSFS, VT_TFS, VT_VFS, VT_CODA, VT_NTFS, VT_HPFS, VT_NWFS, VT_SMBFS, VT_UDF, VT_EXT2FS }; diff --git a/sys/vfs/nullfs/null_vnops.c b/sys/vfs/nullfs/null_vnops.c index ce1c2e73c8..20774e326b 100644 --- a/sys/vfs/nullfs/null_vnops.c +++ b/sys/vfs/nullfs/null_vnops.c @@ -38,7 +38,7 @@ * Ancestors: * @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92 * $FreeBSD: src/sys/miscfs/nullfs/null_vnops.c,v 1.38.2.6 2002/07/31 00:32:28 semenu Exp $ - * $DragonFly: src/sys/vfs/nullfs/null_vnops.c,v 1.24 2006/01/04 03:09:53 dillon Exp $ + * $DragonFly: src/sys/vfs/nullfs/null_vnops.c,v 1.25 2006/05/14 18:00:04 swildner Exp $ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project * @@ -93,9 +93,9 @@ * no private operations, so there is no need of subtle dispatching routines. * * Unlike the old code, this implementation is not a general skeleton overlay - * filesystem: to get more comprehensive overlaying, like that of umapfs, we - * will need vnode operation dispatch. Other overlay filesystems, like unionfs - * might be able to get on with a hybrid solution: overlay some vnodes, and rely + * filesystem: to get more comprehensive overlaying, we will need vnode + * operation dispatch. Other overlay filesystems, like unionfs might be + * able to get on with a hybrid solution: overlay some vnodes, and rely * on namecache API for the rest. */ diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile index b832ccd173..502108c1c5 100644 --- a/usr.sbin/amd/amd/Makefile +++ b/usr.sbin/amd/amd/Makefile @@ -4,7 +4,7 @@ # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD: src/usr.sbin/amd/amd/Makefile,v 1.17.2.1 2001/04/25 12:09:12 ru Exp $ -# $DragonFly: src/usr.sbin/amd/amd/Makefile,v 1.2 2003/06/17 04:29:52 dillon Exp $ +# $DragonFly: src/usr.sbin/amd/amd/Makefile,v 1.3 2006/05/14 18:00:04 swildner Exp $ # .PATH: ${.CURDIR}/../../../contrib/amd/amd @@ -20,7 +20,7 @@ SRCS+= amfs_union.c amq_subr.c amq_svc.c autil.c clock.c conf.c SRCS+= get_args.c info_file.c info_ndbm.c info_nis.c info_passwd.c SRCS+= info_union.c map.c mapc.c mntfs.c nfs_prot_svc.c nfs_start.c SRCS+= nfs_subr.c ops_cdfs.c ops_lofs.c ops_mfs.c ops_nfs.c ops_nfs3.c -SRCS+= ops_nullfs.c ops_pcfs.c ops_tfs.c ops_ufs.c ops_umapfs.c +SRCS+= ops_nullfs.c ops_pcfs.c ops_tfs.c ops_ufs.c SRCS+= ops_unionfs.c opts.c restart.c rpc_fwd.c sched.c SRCS+= srvr_amfs_auto.c srvr_nfs.c diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h index 20ea23b9cf..a412738df2 100644 --- a/usr.sbin/amd/include/config.h +++ b/usr.sbin/amd/include/config.h @@ -1,6 +1,6 @@ /* * $FreeBSD: src/usr.sbin/amd/include/config.h,v 1.15.2.1 2001/08/29 08:46:52 alfred Exp $ - * $DragonFly: src/usr.sbin/amd/include/config.h,v 1.3 2003/08/08 04:18:44 dillon Exp $ + * $DragonFly: src/usr.sbin/amd/include/config.h,v 1.4 2006/05/14 18:00:05 swildner Exp $ * * portions derived from * $NetBSD: config.h,v 1.11 1998/08/08 22:33:37 christos Exp $ @@ -148,9 +148,6 @@ /* Define if have UNIONFS filesystem */ #define HAVE_FS_UNIONFS 1 -/* Define if have UMAPFS (uid/gid mapping) filesystem */ -#define HAVE_FS_UMAPFS 1 - /* * Check for the type of the mount(2) system name for a filesystem. @@ -209,9 +206,6 @@ /* Mount(2) type/name for UNIONFS filesystem */ #define MOUNT_TYPE_UNIONFS "union" -/* Mount(2) type/name for UMAPFS (uid/gid mapping) filesystem */ -#define MOUNT_TYPE_UMAPFS "umap" - /* * Check for the string name for the mount-table of a filesystem. @@ -265,9 +259,6 @@ /* Mount-table entry name for UNIONFS filesystem */ #define MNTTAB_TYPE_UNIONFS "union" -/* Mount-table entry name for UMAPFS (uid/gid mapping) filesystem */ -#define MNTTAB_TYPE_UMAPFS "umap" - /* * Name of mount table file name. */