PSARC/2006/061 xmemfs EOF

6379911 Remove support for xmemfs from Solaris

--HG--
rename : usr/src/cmd/fs.d/xmemfs/Makefile => deleted_files/usr/src/cmd/fs.d/xmemfs/Makefile
rename : usr/src/cmd/fs.d/xmemfs/mount.c => deleted_files/usr/src/cmd/fs.d/xmemfs/mount.c
rename : usr/src/uts/intel/fs/xmemfs/seg_xmem.c => deleted_files/usr/src/uts/intel/fs/xmemfs/seg_xmem.c
rename : usr/src/uts/intel/fs/xmemfs/xmem_dir.c => deleted_files/usr/src/uts/intel/fs/xmemfs/xmem_dir.c
rename : usr/src/uts/intel/fs/xmemfs/xmem_subr.c => deleted_files/usr/src/uts/intel/fs/xmemfs/xmem_subr.c
rename : usr/src/uts/intel/fs/xmemfs/xmem_vfsops.c => deleted_files/usr/src/uts/intel/fs/xmemfs/xmem_vfsops.c
rename : usr/src/uts/intel/fs/xmemfs/xmem_vnops.c => deleted_files/usr/src/uts/intel/fs/xmemfs/xmem_vnops.c
rename : usr/src/uts/intel/sys/fs/seg_xmem.h => deleted_files/usr/src/uts/intel/sys/fs/seg_xmem.h
rename : usr/src/uts/intel/sys/fs/xmem.h => deleted_files/usr/src/uts/intel/sys/fs/xmem.h
rename : usr/src/uts/intel/xmemfs/Makefile => deleted_files/usr/src/uts/intel/xmemfs/Makefile

21 files changed, 26 insertions, 50 deletions

diff --git a/usr/src/cmd/fs.d/xmemfs/Makefile b/deleted_files/usr/src/cmd/fs.d/xmemfs/Makefile
index b2e9e8c85d..b2e9e8c85d 100644
--- a/usr/src/cmd/fs.d/xmemfs/Makefile
+++ b/deleted_files/usr/src/cmd/fs.d/xmemfs/Makefile
diff --git a/usr/src/cmd/fs.d/xmemfs/mount.c b/deleted_files/usr/src/cmd/fs.d/xmemfs/mount.c
index 9cc7b5f950..9cc7b5f950 100644
--- a/usr/src/cmd/fs.d/xmemfs/mount.c
+++ b/deleted_files/usr/src/cmd/fs.d/xmemfs/mount.c
diff --git a/usr/src/uts/intel/fs/xmemfs/seg_xmem.c b/deleted_files/usr/src/uts/intel/fs/xmemfs/seg_xmem.c
index 12c0fffddd..12c0fffddd 100644
--- a/usr/src/uts/intel/fs/xmemfs/seg_xmem.c
+++ b/deleted_files/usr/src/uts/intel/fs/xmemfs/seg_xmem.c
diff --git a/usr/src/uts/intel/fs/xmemfs/xmem_dir.c b/deleted_files/usr/src/uts/intel/fs/xmemfs/xmem_dir.c
index a0ccd4c92b..a0ccd4c92b 100644
--- a/usr/src/uts/intel/fs/xmemfs/xmem_dir.c
+++ b/deleted_files/usr/src/uts/intel/fs/xmemfs/xmem_dir.c
diff --git a/usr/src/uts/intel/fs/xmemfs/xmem_subr.c b/deleted_files/usr/src/uts/intel/fs/xmemfs/xmem_subr.c
index fd8f80e82f..fd8f80e82f 100644
--- a/usr/src/uts/intel/fs/xmemfs/xmem_subr.c
+++ b/deleted_files/usr/src/uts/intel/fs/xmemfs/xmem_subr.c
diff --git a/usr/src/uts/intel/fs/xmemfs/xmem_vfsops.c b/deleted_files/usr/src/uts/intel/fs/xmemfs/xmem_vfsops.c
index 40dd8e9647..40dd8e9647 100644
--- a/usr/src/uts/intel/fs/xmemfs/xmem_vfsops.c
+++ b/deleted_files/usr/src/uts/intel/fs/xmemfs/xmem_vfsops.c
diff --git a/usr/src/uts/intel/fs/xmemfs/xmem_vnops.c b/deleted_files/usr/src/uts/intel/fs/xmemfs/xmem_vnops.c
index de6f99f6cb..de6f99f6cb 100644
--- a/usr/src/uts/intel/fs/xmemfs/xmem_vnops.c
+++ b/deleted_files/usr/src/uts/intel/fs/xmemfs/xmem_vnops.c
diff --git a/usr/src/uts/intel/sys/fs/seg_xmem.h b/deleted_files/usr/src/uts/intel/sys/fs/seg_xmem.h
index cd172e00c9..cd172e00c9 100644
--- a/usr/src/uts/intel/sys/fs/seg_xmem.h
+++ b/deleted_files/usr/src/uts/intel/sys/fs/seg_xmem.h
diff --git a/usr/src/uts/intel/sys/fs/xmem.h b/deleted_files/usr/src/uts/intel/sys/fs/xmem.h
index 11e36ee5c2..11e36ee5c2 100644
--- a/usr/src/uts/intel/sys/fs/xmem.h
+++ b/deleted_files/usr/src/uts/intel/sys/fs/xmem.h
diff --git a/usr/src/uts/intel/xmemfs/Makefile b/deleted_files/usr/src/uts/intel/xmemfs/Makefile
index 9e1f69f75b..9e1f69f75b 100644
--- a/usr/src/uts/intel/xmemfs/Makefile
+++ b/deleted_files/usr/src/uts/intel/xmemfs/Makefile
diff --git a/usr/src/Makefile.lint b/usr/src/Makefile.lint
index 9198b7d694..50773f685d 100644
--- a/usr/src/Makefile.lint
+++ b/usr/src/Makefile.lint
@@ -421,7 +421,6 @@ $(CLOSED_BUILD)COMMON_SUBDIRS += \
 
 i386_SUBDIRS= \
 	cmd/biosdev \
-	cmd/fs.d/xmemfs \
 	cmd/rtc \
 	lib/brand/lx \
 	lib/cfgadm_plugins/sata
diff --git a/usr/src/cmd/fs.d/Makefile b/usr/src/cmd/fs.d/Makefile
index d14b141a07..7027a0e299 100644
--- a/usr/src/cmd/fs.d/Makefile
+++ b/usr/src/cmd/fs.d/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -46,11 +46,8 @@ include ../Makefile.cmd
 
 SUBDIR1= lofs zfs
 SUBDIR2= dev fd pcfs nfs hsfs proc ctfs udfs ufs tmpfs cachefs autofs mntfs objfs
-i386_SUBDIRS= xmemfs
-i386_I18NDIRS= xmemfs
-SUBDIRS= $(SUBDIR1) $(SUBDIR2) $($(MACH)_SUBDIRS)
-ALL_SUBDIRS= $(SUBDIR1) $(SUBDIR2) $(i386_SUBDIRS)
-I18NDIRS= $(SUBDIR2) $(i386_I18NDIRS)
+SUBDIRS= $(SUBDIR1) $(SUBDIR2)
+I18NDIRS= $(SUBDIR2)
 
 CLOBBERFILES += $(POFILES_XPG4)
 
@@ -195,11 +192,11 @@ fs.dfl:
 $(ROOTUSRSBINFF):	$(ROOTUSRSBIN)/ff
 	-$(RM) $@; $(SYMLINK) ./ff $@
 
-clean: $(ALL_SUBDIRS) .WAIT clean_local
+clean: $(SUBDIRS) .WAIT clean_local
 
 clean_local:
 
-clobber: $(ALL_SUBDIRS) .WAIT clobber_local
+clobber: $(SUBDIRS) .WAIT clobber_local
 
 clobber_local:	clean_local
 	$(RM) $(PROG) $(ROOTFS_PROG) $(SPPROG) $(MNTTAB) $(DEFAULTFILES) \
@@ -207,7 +204,7 @@ clobber_local:	clean_local
 
 lint:
 
-$(ALL_SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET)
 
 FRC:
diff --git a/usr/src/cmd/zoneadm/zoneadm.c b/usr/src/cmd/zoneadm/zoneadm.c
index 5d4f180419..9da3182f85 100644
--- a/usr/src/cmd/zoneadm/zoneadm.c
+++ b/usr/src/cmd/zoneadm/zoneadm.c
@@ -926,8 +926,7 @@ validate_zonepath(char *path, int cmd_num)
 		    rpath);
 		return (Z_ERR);
 	}
-	if ((strcmp(stbuf.st_fstype, MNTTYPE_TMPFS) == 0) ||
-	    (strcmp(stbuf.st_fstype, MNTTYPE_XMEMFS) == 0)) {
+	if (strcmp(stbuf.st_fstype, MNTTYPE_TMPFS) == 0) {
 		(void) printf(gettext("WARNING: %s is on a temporary "
 		    "file system.\n"), rpath);
 	}
diff --git a/usr/src/pkgdefs/SUNWcsu/prototype_i386 b/usr/src/pkgdefs/SUNWcsu/prototype_i386
index 1523bf5b68..7dffa22aad 100644
--- a/usr/src/pkgdefs/SUNWcsu/prototype_i386
+++ b/usr/src/pkgdefs/SUNWcsu/prototype_i386
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -69,7 +69,6 @@ f none usr/kernel/drv/pts 755 root sys
 f none usr/kernel/exec/javaexec 755 root sys
 f none usr/kernel/fs/fdfs 755 root sys
 f none usr/kernel/fs/pcfs 755 root sys
-f none usr/kernel/fs/xmemfs 755 root sys
 f none usr/kernel/sched/FX 755 root sys
 f none usr/kernel/sched/FX_DPTBL 755 root sys
 f none usr/kernel/sched/IA 755 root sys
@@ -82,8 +81,6 @@ f none usr/kernel/sys/acctctl 755 root sys
 f none usr/kernel/sys/exacctsys 755 root sys
 f none usr/kernel/sys/sysacct 755 root sys
 f none usr/lib/devfsadm/linkmod/SUNW_misc_link_i386.so 755 root sys
-d none usr/lib/fs/xmemfs 755 root sys
-f none usr/lib/fs/xmemfs/mount 555 root bin
 s none usr/sbin/installgrub=../../sbin/installgrub
 f none usr/sbin/rtc 555 root bin
 d none usr/sbin/i86 755 root bin
@@ -126,7 +123,6 @@ f none usr/kernel/exec/amd64/javaexec 755 root sys
 d none usr/kernel/fs/amd64 755 root sys
 f none usr/kernel/fs/amd64/fdfs 755 root sys
 f none usr/kernel/fs/amd64/pcfs 755 root sys
-f none usr/kernel/fs/amd64/xmemfs 755 root sys
 d none usr/kernel/pcbe/amd64 755 root sys
 d none usr/kernel/sched/amd64 755 root sys
 f none usr/kernel/sched/amd64/FX 755 root sys
diff --git a/usr/src/pkgdefs/SUNWhea/prototype_i386 b/usr/src/pkgdefs/SUNWhea/prototype_i386
index 35b0b72129..3d7a74517e 100644
--- a/usr/src/pkgdefs/SUNWhea/prototype_i386
+++ b/usr/src/pkgdefs/SUNWhea/prototype_i386
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -83,8 +83,6 @@ f none usr/include/sys/dktp/dadkio.h 644 root bin
 f none usr/include/sys/dktp/fdisk.h 644 root bin
 f none usr/include/sys/dma_engine.h 644 root bin
 f none usr/include/sys/fp.h 644 root bin
-f none usr/include/sys/fs/seg_xmem.h 644 root bin
-f none usr/include/sys/fs/xmem.h 644 root bin
 d none usr/include/sys/i2o 755 root bin
 f none usr/include/sys/i2o/i2omsg.h 644 root bin
 f none usr/include/sys/i2o/i2outil.h 644 root bin
diff --git a/usr/src/tools/scripts/bfu.sh b/usr/src/tools/scripts/bfu.sh
index 6e67adaa67..5712e4f5a6 100644
--- a/usr/src/tools/scripts/bfu.sh
+++ b/usr/src/tools/scripts/bfu.sh
@@ -6184,6 +6184,15 @@ mondo_loop() {
 	# Remove audit_record_attr. Moved to /usr/lib/security
 	rm -f $root/etc/security/audit_record_attr
 
+	#
+	# Remove xmemfs altogether.
+	#
+	rm -f $usr/include/sys/fs/xmem.h
+	rm -f $usr/include/sys/fs/seg_xmem.h
+	rm -f $usr/kernel/fs/xmemfs
+	rm -f $usr/kernel/fs/amd64/xmemfs
+	rm -rf $usr/lib/fs/xmemfs
+
 	# End of pre-archive extraction hacks.
 
 	if [ $diskless = no -a $zone = global ]; then
diff --git a/usr/src/uts/common/sys/mntent.h b/usr/src/uts/common/sys/mntent.h
index 1b1fd119aa..0cda0fd6d4 100644
--- a/usr/src/uts/common/sys/mntent.h
+++ b/usr/src/uts/common/sys/mntent.h
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  *	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T
@@ -54,7 +54,6 @@ extern "C" {
 #define	MNTTYPE_TMPFS	"tmpfs"		/* Tmp volatile file system */
 #define	MNTTYPE_AUTOFS	"autofs"	/* Automounter ``file'' system */
 #define	MNTTYPE_MNTFS	"mntfs"		/* In-kernel mnttab */
-#define	MNTTYPE_XMEMFS	"xmemfs"	/* Extended memory FS, IA32 only */
 #define	MNTTYPE_DEV	"dev"		/* /dev file system */
 #define	MNTTYPE_CTFS	"ctfs"		/* Contract file system */
 #define	MNTTYPE_OBJFS	"objfs"		/* Kernel object file system */
diff --git a/usr/src/uts/intel/Makefile.files b/usr/src/uts/intel/Makefile.files
index d2ab9a3290..2cdbe02a14 100644
--- a/usr/src/uts/intel/Makefile.files
+++ b/usr/src/uts/intel/Makefile.files
@@ -22,7 +22,7 @@
 #
 # uts/intel/Makefile.files
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -101,13 +101,6 @@ GENUNIX_OBJS +=		\
 CORE_OBJS +=		\
 	prmachdep.o
 
-XMEMFS_OBJS +=		\
-	seg_xmem.o	\
-	xmem_dir.o	\
-	xmem_subr.o	\
-	xmem_vfsops.o	\
-	xmem_vnops.o
-
 LX_PROC_OBJS +=	\
 	lx_prsubr.o	\
 	lx_prvfsops.o	\
diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared
index 853410e89a..22f043eaeb 100644
--- a/usr/src/uts/intel/Makefile.intel.shared
+++ b/usr/src/uts/intel/Makefile.intel.shared
@@ -431,7 +431,7 @@ SCHED_KMODS	+= IA RT TS RT_DPTBL TS_DPTBL FSS FX FX_DPTBL
 #
 FS_KMODS	+= autofs cachefs ctfs dev devfs fdfs fifofs hsfs lofs
 FS_KMODS	+= lx_afs lx_proc mntfs namefs nfs objfs zfs
-FS_KMODS	+= pcfs procfs sockfs specfs tmpfs udfs ufs xmemfs
+FS_KMODS	+= pcfs procfs sockfs specfs tmpfs udfs ufs
 
 #
 #	Streams Modules (/kernel/strmod):
diff --git a/usr/src/uts/intel/Makefile.rules b/usr/src/uts/intel/Makefile.rules
index ccdce16e4c..3770e4e9dd 100644
--- a/usr/src/uts/intel/Makefile.rules
+++ b/usr/src/uts/intel/Makefile.rules
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -60,10 +60,6 @@ $(OBJS_DIR)/%.o:		$(UTSBASE)/intel/fs/proc/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:		$(UTSBASE)/intel/fs/xmemfs/%.c
-	$(COMPILE.c) -o $@ $<
-	$(CTFCONVERT_O)
-
 $(OBJS_DIR)/%.o:		$(UTSBASE)/intel/ia32/ml/%.s
 	$(COMPILE.s) -o $@ $<
 
@@ -160,9 +156,6 @@ $(LINTS_DIR)/%.ln:		$(UTSBASE)/intel/dtrace/%.s
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/intel/fs/proc/%.c
 	@($(LHEAD) $(LINT.c) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/intel/fs/xmemfs/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/intel/ia32/ml/%.s
 	@($(LHEAD) $(LINT.s) $< $(LTAIL))
 
diff --git a/usr/src/uts/intel/sys/Makefile b/usr/src/uts/intel/sys/Makefile
index 550c2eeb98..491f4d3224 100644
--- a/usr/src/uts/intel/sys/Makefile
+++ b/usr/src/uts/intel/sys/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -99,10 +99,6 @@ CLOSEDHDRS = \
 SUBHDRS	=			\
 	dktp/mscsi.h
 
-FSHDRS =			\
-	seg_xmem.h		\
-	xmem.h		
-
 ROOTDIR=	$(ROOT)/usr/include/sys
 SCSIDIR=	$(ROOTDIR)/scsi
 SCSIDIRS=	$(SCSIDIR) $(SCSIDIR)/conf $(SCSIDIR)/generic \
@@ -115,12 +111,9 @@ ROOTDIRS=	$(ROOTDIR) $(ROOTFSDIR)
 ROOTHDRS= $(HDRS:%=$(ROOTDIR)/%) $(SUBHDRS:%=$(ROOTDIR)/%)
 $(CLOSED_BUILD)ROOTHDRS += $(CLOSEDHDRS:%=$(ROOTDIR)/%)
 
-ROOTFSHDRS= $(FSHDRS:%=$(ROOTDIR)/fs/%)
-
 CHECKHDRS= 			\
 	$(HDRS:%.h=%.check)	\
-	$(SUBHDRS:%.h=%.check)	\
-	$(FSHDRS:%.h=fs/%.check)
+	$(SUBHDRS:%.h=%.check)
 
 $(CLOSED_BUILD)CHECKHDRS += $(CLOSEDHDRS:%.h=$(CLOSED)/uts/intel/sys/%.check)
 
@@ -133,9 +126,9 @@ $(ROOTDIR)/%:	$(CLOSED)/uts/intel/sys/%
 
 .KEEP_STATE:
 
-.PARALLEL: $(CHECKHDRS) $(ROOTHDRS) $(ROOTFSHDRS)
+.PARALLEL: $(CHECKHDRS) $(ROOTHDRS)
 
-install_h: $(ROOTDIRS) .WAIT $(ROOTHDRS) $(ROOTFSHDRS)
+install_h: $(ROOTDIRS) .WAIT $(ROOTHDRS)
 
 $(ROOTDIRS):
 	$(INS.dir)