From a42ac676f5979f067e7073427876c5e6afff80bd Mon Sep 17 00:00:00 2001 From: Attilio Rao Date: Wed, 17 Oct 2012 11:30:00 +0000 Subject: [PATCH] Disconnect non-MPSAFE NTFS from the build in preparation for dropping GIANT from VFS. This code is particulary broken and fragile and other in-kernel implementations around, found in other operating systems, don't really seem clean and solid enough to be imported at all. If someone wants to reconsider in-kernel NTFS implementation for inclusion again, a fair effort for completely fixing and cleaning it up is expected. In the while NTFS regular users can use FUSE interface and ntfs-3g port to work with their NTFS partitions. This is not targeted for MFC. --- etc/mtree/BSD.include.dist | 2 -- include/Makefile | 2 +- lib/libprocstat/Makefile | 1 - lib/libprocstat/common_kvm.h | 1 - lib/libprocstat/libprocstat.c | 1 - rescue/rescue/Makefile | 2 +- sbin/Makefile | 1 - sbin/mount/mount.8 | 2 -- sbin/mount/mount.c | 2 +- share/dict/freebsd | 1 - share/man/man7/hier.7 | 2 -- sys/boot/forth/loader.conf | 2 -- sys/conf/NOTES | 6 ------ sys/conf/files | 7 ------- sys/conf/options | 2 -- sys/geom/label/g_label.c | 1 - sys/geom/label/g_label.h | 1 - sys/kern/Make.tags.inc | 1 - sys/mips/rmi/rootfs_list.txt | 1 - sys/modules/Makefile | 2 -- sys/modules/geom/geom_label/Makefile | 1 - 21 files changed, 3 insertions(+), 38 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 417b4f449d22..5a2b6aed7bb4 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -164,8 +164,6 @@ .. nfs .. - ntfs - .. nullfs .. portalfs diff --git a/include/Makefile b/include/Makefile index 65424200afac..3688dc64fa87 100644 --- a/include/Makefile +++ b/include/Makefile @@ -43,7 +43,7 @@ LSUBDIRS= cam/ata cam/scsi \ dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/nvme \ dev/ofw dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ - fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/ntfs fs/nullfs \ + fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \ fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/mountver geom/multipath geom/nop \ diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile index d125898be26c..fade43b97b05 100644 --- a/lib/libprocstat/Makefile +++ b/lib/libprocstat/Makefile @@ -8,7 +8,6 @@ SRCS= cd9660.c \ common_kvm.c \ libprocstat.c \ msdosfs.c \ - ntfs.c \ smbfs.c \ udf.c diff --git a/lib/libprocstat/common_kvm.h b/lib/libprocstat/common_kvm.h index 781863ac7b71..06627bff448c 100644 --- a/lib/libprocstat/common_kvm.h +++ b/lib/libprocstat/common_kvm.h @@ -41,7 +41,6 @@ int devfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int isofs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int msdosfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int nfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); -int ntfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int smbfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int udf_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int ufs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 425aadff7fc9..7ff1d53c63a4 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -973,7 +973,6 @@ procstat_get_vnode_info_kvm(kvm_t *kd, struct filestat *fst, FSTYPE(isofs), FSTYPE(msdosfs), FSTYPE(nfs), - FSTYPE(ntfs), FSTYPE(smbfs), FSTYPE(udf), FSTYPE(ufs), diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index ab88108c96b5..b61735339159 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -93,7 +93,7 @@ CRUNCH_PROGS_sbin= atacontrol badsect \ fsirand gbde geom ifconfig init \ kldconfig kldload kldstat kldunload ldconfig \ md5 mdconfig mdmfs mknod mount mount_cd9660 \ - mount_msdosfs mount_nfs mount_ntfs mount_nullfs \ + mount_msdosfs mount_nfs mount_nullfs \ mount_udf mount_unionfs newfs \ newfs_msdos nos-tun ping reboot \ restore rcorder route routed rtquery rtsol savecore \ diff --git a/sbin/Makefile b/sbin/Makefile index 29a5f16b31e1..16d006da790c 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -52,7 +52,6 @@ SUBDIR=adjkerntz \ mount_fusefs \ mount_msdosfs \ mount_nfs \ - mount_ntfs \ mount_nullfs \ mount_udf \ mount_unionfs \ diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 index 7b819550446c..cda2f4c06d57 100644 --- a/sbin/mount/mount.8 +++ b/sbin/mount/mount.8 @@ -446,7 +446,6 @@ However, for the following file system types: .Cm mfs , .Cm msdosfs , .Cm nfs , -.Cm ntfs , .Cm nullfs , .Cm oldnfs , .Cm smbfs , @@ -543,7 +542,6 @@ support for a particular file system might be provided either on a static .Xr mount_cd9660 8 , .Xr mount_msdosfs 8 , .Xr mount_nfs 8 , -.Xr mount_ntfs 8 , .Xr mount_nullfs 8 , .Xr mount_smbfs 8 , .Xr mount_udf 8 , diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index 7b972192861d..a69c673f0711 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -142,7 +142,7 @@ use_mountprog(const char *vfstype) */ unsigned int i; const char *fs[] = { - "cd9660", "mfs", "msdosfs", "nfs", "ntfs", + "cd9660", "mfs", "msdosfs", "nfs", "nullfs", "oldnfs", "smbfs", "udf", "unionfs", NULL }; diff --git a/share/dict/freebsd b/share/dict/freebsd index 66f57a5e9137..c97170f3cc0e 100644 --- a/share/dict/freebsd +++ b/share/dict/freebsd @@ -128,7 +128,6 @@ NNTP NSS NSSwitch NT -NTFS NTP Nasdaq NetBIOS diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index e6da88241c7b..0c934a2c1f40 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -252,8 +252,6 @@ FIFOs file system MS-DOS file system .It Pa nfs/ C include files for NFS (Network File System) version 2, 3 and 4 -.It Pa ntfs/ -NTFS file system .It Pa nullfs/ loopback file system .It Pa procfs/ diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index 891a2765192e..98bf2a2a33f5 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -168,8 +168,6 @@ linsysfs_load="NO" # Linux compatibility system filesystem msdosfs_load="NO" # FAT-12/16/32 nfsclient_load="NO" # NFS client nfsserver_load="NO" # NFS server -ntfs_load="NO" # NTFS -ntfs_iconv_load="NO" # NTFS iconv character support nullfs_load="NO" # Null filesystem procfs_load="NO" # Process filesystem reiserfs_load="NO" # ReiserFS diff --git a/sys/conf/NOTES b/sys/conf/NOTES index c7802ef77205..3d1d9e94fa6e 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1006,11 +1006,6 @@ options NFSCL #experimental NFS client with NFSv4 options NFSD #experimental NFS server with NFSv4 options KGSSAPI #Kernel GSSAPI implementation -# NT File System. Read-mostly, see mount_ntfs(8) for details. -# For a full read-write NTFS support consider sysutils/fusefs-ntfs -# port/package. -options NTFS - options NULLFS #NULL filesystem options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework @@ -1116,7 +1111,6 @@ device ksyms # Each option requires their base file system and LIBICONV. options CD9660_ICONV options MSDOSFS_ICONV -options NTFS_ICONV options UDF_ICONV diff --git a/sys/conf/files b/sys/conf/files index d734228286ce..4d18d7f9ed7b 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2366,12 +2366,6 @@ fs/nfsserver/nfs_nfsdkrpc.c optional nfsd inet fs/nfsserver/nfs_nfsdserv.c optional nfsd inet fs/nfsserver/nfs_nfsdport.c optional nfsd inet fs/nfsserver/nfs_nfsdcache.c optional nfsd inet -fs/ntfs/ntfs_compr.c optional ntfs -fs/ntfs/ntfs_iconv.c optional ntfs_iconv -fs/ntfs/ntfs_ihash.c optional ntfs -fs/ntfs/ntfs_subr.c optional ntfs -fs/ntfs/ntfs_vfsops.c optional ntfs -fs/ntfs/ntfs_vnops.c optional ntfs fs/nullfs/null_subr.c optional nullfs fs/nullfs/null_vfsops.c optional nullfs fs/nullfs/null_vnops.c optional nullfs @@ -2458,7 +2452,6 @@ geom/label/g_label.c optional geom_label geom/label/g_label_ext2fs.c optional geom_label geom/label/g_label_iso9660.c optional geom_label geom/label/g_label_msdosfs.c optional geom_label -geom/label/g_label_ntfs.c optional geom_label geom/label/g_label_reiserfs.c optional geom_label geom/label/g_label_ufs.c optional geom_label geom/label/g_label_gpt.c optional geom_label diff --git a/sys/conf/options b/sys/conf/options index 2abd08c85fe5..894d28232748 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -212,7 +212,6 @@ FFS opt_dontuse.h FUSE opt_dontuse.h MSDOSFS opt_dontuse.h NANDFS opt_dontuse.h -NTFS opt_dontuse.h NULLFS opt_dontuse.h PROCFS opt_dontuse.h PSEUDOFS opt_dontuse.h @@ -246,7 +245,6 @@ NFSD opt_nfs.h # filesystems and libiconv bridge CD9660_ICONV opt_dontuse.h MSDOSFS_ICONV opt_dontuse.h -NTFS_ICONV opt_dontuse.h UDF_ICONV opt_dontuse.h # If you are following the conditions in the copyright, diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c index 0d8a3b4c4fde..5eb908fcd6ec 100644 --- a/sys/geom/label/g_label.c +++ b/sys/geom/label/g_label.c @@ -84,7 +84,6 @@ const struct g_label_desc *g_labels[] = { &g_label_msdosfs, &g_label_ext2fs, &g_label_reiserfs, - &g_label_ntfs, &g_label_gpt, &g_label_gpt_uuid, NULL diff --git a/sys/geom/label/g_label.h b/sys/geom/label/g_label.h index 06ba2f55ef2f..00028fb41195 100644 --- a/sys/geom/label/g_label.h +++ b/sys/geom/label/g_label.h @@ -84,7 +84,6 @@ extern struct g_label_desc g_label_iso9660; extern struct g_label_desc g_label_msdosfs; extern struct g_label_desc g_label_ext2fs; extern struct g_label_desc g_label_reiserfs; -extern struct g_label_desc g_label_ntfs; extern struct g_label_desc g_label_gpt; extern struct g_label_desc g_label_gpt_uuid; #endif /* _KERNEL */ diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc index 079bab555cba..cb8a3ff993e7 100644 --- a/sys/kern/Make.tags.inc +++ b/sys/kern/Make.tags.inc @@ -28,7 +28,6 @@ COMM= ${SYS}/dev/advansys/*.[ch] \ ${SYS}/fs/fdescfs/*.[ch] \ ${SYS}/fs/fifofs/*.[ch] \ ${SYS}/fs/msdosfs/*.[ch] \ - ${SYS}/fs/ntfs/*.[ch] \ ${SYS}/fs/nullfs/*.[ch] \ ${SYS}/fs/procfs/*.[ch] \ ${SYS}/fs/smbfs/*.[ch] \ diff --git a/sys/mips/rmi/rootfs_list.txt b/sys/mips/rmi/rootfs_list.txt index 989b333bb31f..927a1be5009e 100644 --- a/sys/mips/rmi/rootfs_list.txt +++ b/sys/mips/rmi/rootfs_list.txt @@ -530,7 +530,6 @@ ./sbin/mount_msdosfs ./sbin/mount_nfs ./sbin/mount_newnfs -./sbin/mount_ntfs ./sbin/mount_nullfs ./sbin/mount_udf ./sbin/mount_unionfs diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 450b6614def7..6ec6ba982655 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -240,8 +240,6 @@ SUBDIR= \ nge \ nmdm \ ${_nsp} \ - ntfs \ - ntfs_iconv \ nullfs \ ${_nvd} \ ${_nve} \ diff --git a/sys/modules/geom/geom_label/Makefile b/sys/modules/geom/geom_label/Makefile index 300606ab01b5..3c0998603497 100644 --- a/sys/modules/geom/geom_label/Makefile +++ b/sys/modules/geom/geom_label/Makefile @@ -8,7 +8,6 @@ SRCS+= g_label_ext2fs.c SRCS+= g_label_gpt.c SRCS+= g_label_iso9660.c SRCS+= g_label_msdosfs.c -SRCS+= g_label_ntfs.c SRCS+= g_label_reiserfs.c SRCS+= g_label_ufs.c