Menu
▾
▴
[LV-k25-commit] kernel-2.5/fs Makefile,1.4,1.5 Kconfig,1.4,1.5
|
From: Kenn H. <ke...@us...> - 2005-03-27 23:47:03
|
Update of /cvsroot/linux-vax/kernel-2.5/fs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12986/fs Modified Files: Makefile Kconfig Log Message: Merge with 2.6.11 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/fs/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 21 Mar 2005 23:44:17 -0000 1.4 +++ Makefile 27 Mar 2005 23:46:47 -0000 1.5 @@ -25,6 +25,7 @@ obj-y += binfmt_script.o obj-$(CONFIG_BINFMT_ELF) += binfmt_elf.o +obj-$(CONFIG_BINFMT_ELF_FDPIC) += binfmt_elf_fdpic.o obj-$(CONFIG_BINFMT_SOM) += binfmt_som.o obj-$(CONFIG_BINFMT_FLAT) += binfmt_flat.o @@ -56,7 +57,6 @@ obj-$(CONFIG_CODA_FS) += coda/ obj-$(CONFIG_MINIX_FS) += minix/ obj-$(CONFIG_FAT_FS) += fat/ -obj-$(CONFIG_UMSDOS_FS) += umsdos/ obj-$(CONFIG_MSDOS_FS) += msdos/ obj-$(CONFIG_VFAT_FS) += vfat/ obj-$(CONFIG_BFS_FS) += bfs/ @@ -95,3 +95,4 @@ obj-$(CONFIG_ODS2_FS) += ods2/ obj-$(CONFIG_HOSTFS) += hostfs/ obj-$(CONFIG_HPPFS) += hppfs/ +obj-$(CONFIG_DEBUG_FS) += debugfs/ Index: Kconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/fs/Kconfig,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Kconfig 21 Mar 2005 23:44:14 -0000 1.4 +++ Kconfig 27 Mar 2005 23:46:48 -0000 1.5 @@ -250,7 +250,7 @@ select NLS help This is a port of IBM's Journaled Filesystem . More information is - available in the file Documentation/filesystems/jfs.txt. + available in the file <file:Documentation/filesystems/jfs.txt>. If you do not intend to use the JFS filesystem, say N. @@ -266,6 +266,18 @@ If you don't know what Access Control Lists are, say N +config JFS_SECURITY + bool "JFS Security Labels" + depends on JFS_FS + help + Security labels support alternative access control models + implemented by security modules like SELinux. This option + enables an extended attribute handler for file security + labels in the jfs filesystem. + + If you are not using a security module that requires using + extended attributes for file security labels, say N. + config JFS_DEBUG bool "JFS debugging" depends on JFS_FS @@ -292,82 +304,7 @@ depends on EXT2_FS_POSIX_ACL || EXT3_FS_POSIX_ACL || JFS_POSIX_ACL || REISERFS_FS_POSIX_ACL || NFSD_V4 default y -config XFS_FS - tristate "XFS filesystem support" - help - XFS is a high performance journaling filesystem which originated - on the SGI IRIX platform. It is completely multi-threaded, can - support large files and large filesystems, extended attributes, - variable block sizes, is extent based, and makes extensive use of - Btrees (directories, extents, free space) to aid both performance - and scalability. - - Refer to the documentation at <http://oss.sgi.com/projects/xfs/> - for complete details. This implementation is on-disk compatible - with the IRIX version of XFS. - - To compile this file system support as a module, choose M here: the - module will be called xfs. Be aware, however, that if the file - system of your root partition is compiled as a module, you'll need - to use an initial ramdisk (initrd) to boot. - -config XFS_RT - bool "Realtime support (EXPERIMENTAL)" - depends on XFS_FS && EXPERIMENTAL - help - If you say Y here you will be able to mount and use XFS filesystems - which contain a realtime subvolume. The realtime subvolume is a - separate area of disk space where only file data is stored. The - realtime subvolume is designed to provide very deterministic - data rates suitable for media streaming applications. - - See the xfs man page in section 5 for a bit more information. - - This feature is unsupported at this time, is not yet fully - functional, and may cause serious problems. - - If unsure, say N. - -config XFS_QUOTA - bool "Quota support" - depends on XFS_FS - help - If you say Y here, you will be able to set limits for disk usage on - a per user and/or a per group basis under XFS. XFS considers quota - information as filesystem metadata and uses journaling to provide a - higher level guarantee of consistency. The on-disk data format for - quota is also compatible with the IRIX version of XFS, allowing a - filesystem to be migrated between Linux and IRIX without any need - for conversion. - - If unsure, say N. More comprehensive documentation can be found in - README.quota in the xfsprogs package. XFS quota can be used either - with or without the generic quota support enabled (CONFIG_QUOTA) - - they are completely independent subsystems. - -config XFS_SECURITY - bool "Security Label support" - depends on XFS_FS - help - Security labels support alternative access control models - implemented by security modules like SELinux. This option - enables an extended attribute namespace for inode security - labels in the XFS filesystem. - - If you are not using a security module that requires using - extended attributes for inode security labels, say N. - -config XFS_POSIX_ACL - bool "POSIX ACL support" - depends on XFS_FS - help - POSIX Access Control Lists (ACLs) support permissions for users and - groups beyond the owner/group/world scheme. - - To learn more about Access Control Lists, visit the POSIX ACLs for - Linux website <http://acl.bestbits.at/>. - - If you don't know what Access Control Lists are, say N. +source "fs/xfs/Kconfig" config MINIX_FS tristate "Minix fs support" @@ -566,9 +503,8 @@ tristate select NLS help - If you want to use one of the FAT-based file systems (the MS-DOS, - VFAT (Windows 95) and UMSDOS (used to run Linux on top of an - ordinary DOS partition) file systems), then you must say Y or M here + If you want to use one of the FAT-based file systems (the MS-DOS and + VFAT (Windows 95) file systems), then you must say Y or M here to include FAT support. You will then be able to mount partitions or diskettes with FAT-based file systems and transparently access the files on them, i.e. MSDOS files will look and behave just like all @@ -600,9 +536,6 @@ fat. Note that if you compile the FAT support as a module, you cannot compile any of the FAT-based file systems into the kernel -- they will have to be modules as well. - The file system of your root partition (the one containing the - directory /) cannot be a module, so don't say M here if you intend - to use UMSDOS as your root file system. config MSDOS_FS tristate "MSDOS fs support" @@ -619,10 +552,6 @@ transparent, i.e. the MSDOS files look and behave just like all other Unix files. - If you want to use UMSDOS, the Unix-like file system on top of a - DOS file system, which allows you to run Linux from within a DOS - partition without repartitioning, you'll have to say Y or M here. - If you have Windows 95 or Windows NT installed on your MSDOS partitions, you should use the VFAT file system (say Y to "VFAT fs support" below), or you will not be able to see the long filenames @@ -642,11 +571,6 @@ used by Windows 95, Windows 98, Windows NT 4.0, and the Unix programs from the mtools package. - You cannot use the VFAT file system for your Linux root partition - (the one containing the directory /); use UMSDOS instead if you - want to run Linux from within a DOS partition (i.e. say Y to - "Unix like fs on top of std MSDOS fs", below). - The VFAT support enlarges your kernel by about 10 KB and it only works if you said Y to the "DOS FAT fs support" above. Please read the file <file:Documentation/filesystems/vfat.txt> for details. If @@ -677,35 +601,6 @@ If unsure, you shouldn't set "utf8" here. See <file:Documentation/filesystems/vfat.txt> for more information. -config UMSDOS_FS -#dep_tristate ' UMSDOS: Unix-like file system on top of standard MSDOS fs' CONFIG_UMSDOS_FS $CONFIG_MSDOS_FS -# UMSDOS is temprory broken - bool - help - Say Y here if you want to run Linux from within an existing DOS - partition of your hard drive. The advantage of this is that you can - get away without repartitioning your hard drive (which often implies - backing everything up and restoring afterwards) and hence you're - able to quickly try out Linux or show it to your friends; the - disadvantage is that Linux becomes susceptible to DOS viruses and - that UMSDOS is somewhat slower than ext2fs. Another use of UMSDOS - is to write files with long unix filenames to MSDOS floppies; it - also allows Unix-style soft-links and owner/permissions of files on - MSDOS floppies. You will need a program called umssync in order to - make use of UMSDOS; read - <file:Documentation/filesystems/umsdos.txt>. - - To get utilities for initializing/checking UMSDOS file system, or - latest patches and/or information, visit the UMSDOS home page at - <http://www.voyager.hr/~mnalis/umsdos/>. - - This option enlarges your kernel by about 28 KB and it only works if - you said Y to both "DOS FAT fs support" and "MSDOS fs support" - above. To compile this as a module, choose M here: the module will be - called umsdos. Note that the file system of your root partition - (the one containing the directory /) cannot be a module, so saying M - could be dangerous. If unsure, say N. - config NTFS_FS tristate "NTFS file system support" select NLS @@ -1057,10 +952,10 @@ help The BeOS File System (BeFS) is the native file system of Be, Inc's BeOS. Notable features include support for arbitrary attributes - on files and directories, and database-like indices on selected + on files and directories, and database-like indeces on selected attributes. (Also note that this driver doesn't make those features available at this time). It is a 64 bit filesystem, so it supports - extreemly large volumes and files. + extremly large volumes and files. If you use this filesystem, you should also say Y to at least one of the NLS (native language support) options below. @@ -1179,6 +1074,15 @@ Say 'N' unless you have NAND flash. +config JFFS2_FS_NOR_ECC + bool "JFFS2 support for ECC'd NOR flash (EXPERIMENTAL)" + depends on JFFS2_FS && EXPERIMENTAL + default n + help + This enables the experimental support for NOR flash with transparent + ECC for JFFS2. This type of flash chip is not common, however it is + available from ST Microelectronics. + config JFFS2_COMPRESSION_OPTIONS bool "Advanced compression options for JFFS2" depends on JFFS2_FS @@ -1201,7 +1105,7 @@ help Zlib is designed to be a free, general-purpose, legally unencumbered, lossless data-compression library for use on virtually any computer - hardware and operating system. See http://www.gzip.org/zlib/ for + hardware and operating system. See <http://www.gzip.org/zlib/> for further information. Say 'Y' if unsure. @@ -1226,7 +1130,7 @@ depends on JFFS2_FS help You can set here the default compression mode of JFFS2 from - the avaiable compression modes. Don't touch if unsure. + the available compression modes. Don't touch if unsure. config JFFS2_CMODE_NONE bool "no compression" @@ -1317,7 +1221,7 @@ config QNX4FS_RW bool "QNX4FS write support (DANGEROUS)" - depends on QNX4FS_FS && EXPERIMENTAL + depends on QNX4FS_FS && EXPERIMENTAL && BROKEN help Say Y if you want to test write support for QNX4 file systems. @@ -1505,6 +1409,7 @@ depends on INET select LOCKD select SUNRPC + select EXPORTFS help If you want your Linux box to act as an NFS *server*, so that other computers on your local network which support NFS can access certain @@ -1578,7 +1483,6 @@ config EXPORTFS tristate - default NFSD config SUNRPC tristate @@ -1811,7 +1715,7 @@ If you say Y here, you will get an experimental Andrew File System driver. It currently only supports unsecured read-only AFS access. - See Documentation/filesystems/afs.txt for more intormation. + See <file:Documentation/filesystems/afs.txt> for more intormation. If unsure, say N. |
