From owner-svn-src-head@FreeBSD.ORG Wed Oct 17 11:30:01 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 63B094BC; Wed, 17 Oct 2012 11:30:01 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 42CB18FC12; Wed, 17 Oct 2012 11:30:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9HBU1rp060273; Wed, 17 Oct 2012 11:30:01 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9HBU0fH060245; Wed, 17 Oct 2012 11:30:00 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201210171130.q9HBU0fH060245@svn.freebsd.org> From: Attilio Rao Date: Wed, 17 Oct 2012 11:30:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r241636 - in head: etc/mtree include lib/libprocstat rescue/rescue sbin sbin/mount share/dict share/man/man7 sys/boot/forth sys/conf sys/geom/label sys/kern sys/mips/rmi sys/modules sys... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Oct 2012 11:30:01 -0000 Author: attilio Date: Wed Oct 17 11:30:00 2012 New Revision: 241636 URL: http://svn.freebsd.org/changeset/base/241636 Log: 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. Modified: head/etc/mtree/BSD.include.dist head/include/Makefile head/lib/libprocstat/Makefile head/lib/libprocstat/common_kvm.h head/lib/libprocstat/libprocstat.c head/rescue/rescue/Makefile head/sbin/Makefile head/sbin/mount/mount.8 head/sbin/mount/mount.c head/share/dict/freebsd head/share/man/man7/hier.7 head/sys/boot/forth/loader.conf head/sys/conf/NOTES head/sys/conf/files head/sys/conf/options head/sys/geom/label/g_label.c head/sys/geom/label/g_label.h head/sys/kern/Make.tags.inc head/sys/mips/rmi/rootfs_list.txt head/sys/modules/Makefile head/sys/modules/geom/geom_label/Makefile Modified: head/etc/mtree/BSD.include.dist ============================================================================== --- head/etc/mtree/BSD.include.dist Wed Oct 17 11:28:44 2012 (r241635) +++ head/etc/mtree/BSD.include.dist Wed Oct 17 11:30:00 2012 (r241636) @@ -164,8 +164,6 @@ .. nfs .. - ntfs - .. nullfs .. portalfs Modified: head/include/Makefile ============================================================================== --- head/include/Makefile Wed Oct 17 11:28:44 2012 (r241635) +++ head/include/Makefile Wed Oct 17 11:30:00 2012 (r241636) @@ -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 \ Modified: head/lib/libprocstat/Makefile ============================================================================== --- head/lib/libprocstat/Makefile Wed Oct 17 11:28:44 2012 (r241635) +++ head/lib/libprocstat/Makefile Wed Oct 17 11:30:00 2012 (r241636) @@ -8,7 +8,6 @@ SRCS= cd9660.c \ common_kvm.c \ libprocstat.c \ msdosfs.c \ - ntfs.c \ smbfs.c \ udf.c Modified: head/lib/libprocstat/common_kvm.h ============================================================================== --- head/lib/libprocstat/common_kvm.h Wed Oct 17 11:28:44 2012 (r241635) +++ head/lib/libprocstat/common_kvm.h Wed Oct 17 11:30:00 2012 (r241636) @@ -41,7 +41,6 @@ int devfs_filestat(kvm_t *kd, struct vno 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); Modified: head/lib/libprocstat/libprocstat.c ============================================================================== --- head/lib/libprocstat/libprocstat.c Wed Oct 17 11:28:44 2012 (r241635) +++ head/lib/libprocstat/libprocstat.c Wed Oct 17 11:30:00 2012 (r241636) @@ -973,7 +973,6 @@ procstat_get_vnode_info_kvm(kvm_t *kd, s FSTYPE(isofs), FSTYPE(msdosfs), FSTYPE(nfs), - FSTYPE(ntfs), FSTYPE(smbfs), FSTYPE(udf), FSTYPE(ufs), Modified: head/rescue/rescue/Makefile ============================================================================== --- head/rescue/rescue/Makefile Wed Oct 17 11:28:44 2012 (r241635) +++ head/rescue/rescue/Makefile Wed Oct 17 11:30:00 2012 (r241636) @@ -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 \ Modified: head/sbin/Makefile ============================================================================== --- head/sbin/Makefile Wed Oct 17 11:28:44 2012 (r241635) +++ head/sbin/Makefile Wed Oct 17 11:30:00 2012 (r241636) @@ -52,7 +52,6 @@ SUBDIR=adjkerntz \ mount_fusefs \ mount_msdosfs \ mount_nfs \ - mount_ntfs \ mount_nullfs \ mount_udf \ mount_unionfs \ Modified: head/sbin/mount/mount.8 ============================================================================== --- head/sbin/mount/mount.8 Wed Oct 17 11:28:44 2012 (r241635) +++ head/sbin/mount/mount.8 Wed Oct 17 11:30:00 2012 (r241636) @@ -446,7 +446,6 @@ However, for the following file system t .Cm mfs , .Cm msdosfs , .Cm nfs , -.Cm ntfs , .Cm nullfs , .Cm oldnfs , .Cm smbfs , @@ -543,7 +542,6 @@ support for a particular file system mig .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 , Modified: head/sbin/mount/mount.c ============================================================================== --- head/sbin/mount/mount.c Wed Oct 17 11:28:44 2012 (r241635) +++ head/sbin/mount/mount.c Wed Oct 17 11:30:00 2012 (r241636) @@ -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 }; Modified: head/share/dict/freebsd ============================================================================== --- head/share/dict/freebsd Wed Oct 17 11:28:44 2012 (r241635) +++ head/share/dict/freebsd Wed Oct 17 11:30:00 2012 (r241636) @@ -128,7 +128,6 @@ NNTP NSS NSSwitch NT -NTFS NTP Nasdaq NetBIOS Modified: head/share/man/man7/hier.7 ============================================================================== --- head/share/man/man7/hier.7 Wed Oct 17 11:28:44 2012 (r241635) +++ head/share/man/man7/hier.7 Wed Oct 17 11:30:00 2012 (r241636) @@ -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/ Modified: head/sys/boot/forth/loader.conf ============================================================================== --- head/sys/boot/forth/loader.conf Wed Oct 17 11:28:44 2012 (r241635) +++ head/sys/boot/forth/loader.conf Wed Oct 17 11:30:00 2012 (r241636) @@ -168,8 +168,6 @@ linsysfs_load="NO" # Linux compatibilit 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 Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Wed Oct 17 11:28:44 2012 (r241635) +++ head/sys/conf/NOTES Wed Oct 17 11:30:00 2012 (r241636) @@ -1006,11 +1006,6 @@ options NFSCL #experimental NFS clien 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 Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Wed Oct 17 11:28:44 2012 (r241635) +++ head/sys/conf/files Wed Oct 17 11:30:00 2012 (r241636) @@ -2366,12 +2366,6 @@ fs/nfsserver/nfs_nfsdkrpc.c optional nfs 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_labe 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 Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Wed Oct 17 11:28:44 2012 (r241635) +++ head/sys/conf/options Wed Oct 17 11:30:00 2012 (r241636) @@ -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, Modified: head/sys/geom/label/g_label.c ============================================================================== --- head/sys/geom/label/g_label.c Wed Oct 17 11:28:44 2012 (r241635) +++ head/sys/geom/label/g_label.c Wed Oct 17 11:30:00 2012 (r241636) @@ -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 Modified: head/sys/geom/label/g_label.h ============================================================================== --- head/sys/geom/label/g_label.h Wed Oct 17 11:28:44 2012 (r241635) +++ head/sys/geom/label/g_label.h Wed Oct 17 11:30:00 2012 (r241636) @@ -84,7 +84,6 @@ extern struct g_label_desc g_label_iso96 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 */ Modified: head/sys/kern/Make.tags.inc ============================================================================== --- head/sys/kern/Make.tags.inc Wed Oct 17 11:28:44 2012 (r241635) +++ head/sys/kern/Make.tags.inc Wed Oct 17 11:30:00 2012 (r241636) @@ -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] \ Modified: head/sys/mips/rmi/rootfs_list.txt ============================================================================== --- head/sys/mips/rmi/rootfs_list.txt Wed Oct 17 11:28:44 2012 (r241635) +++ head/sys/mips/rmi/rootfs_list.txt Wed Oct 17 11:30:00 2012 (r241636) @@ -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 Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Wed Oct 17 11:28:44 2012 (r241635) +++ head/sys/modules/Makefile Wed Oct 17 11:30:00 2012 (r241636) @@ -240,8 +240,6 @@ SUBDIR= \ nge \ nmdm \ ${_nsp} \ - ntfs \ - ntfs_iconv \ nullfs \ ${_nvd} \ ${_nve} \ Modified: head/sys/modules/geom/geom_label/Makefile ============================================================================== --- head/sys/modules/geom/geom_label/Makefile Wed Oct 17 11:28:44 2012 (r241635) +++ head/sys/modules/geom/geom_label/Makefile Wed Oct 17 11:30:00 2012 (r241636) @@ -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