patch-2.3.47 linux/fs/Config.in

• Lines: 148
• Date: Sun Feb 20 16:21:49 2000
• Orig file: v2.3.46/linux/fs/Config.in
• Orig date: Wed Feb 16 17:03:52 2000

diff -u --recursive --new-file v2.3.46/linux/fs/Config.in linux/fs/Config.in
@@ -1,32 +1,32 @@
 #
-# Filesystem configuration
+# File system configuration
 #
 mainmenu_option next_comment
-comment 'Filesystems'
+comment 'File systems'
 
 bool 'Quota support' CONFIG_QUOTA
 tristate 'Kernel automounter support' CONFIG_AUTOFS_FS
 tristate 'Kernel automounter version 4 support (also supports v3)' CONFIG_AUTOFS4_FS
 
 
-dep_tristate 'ADFS filesystem support (read only) (EXPERIMENTAL)' CONFIG_ADFS_FS $CONFIG_EXPERIMENTAL
+dep_tristate 'ADFS file system support (read only) (EXPERIMENTAL)' CONFIG_ADFS_FS $CONFIG_EXPERIMENTAL
 
-tristate 'Amiga FFS filesystem support' CONFIG_AFFS_FS
+tristate 'Amiga FFS file system support' CONFIG_AFFS_FS
 
-dep_tristate 'Apple Macintosh filesystem support (EXPERIMENTAL)' CONFIG_HFS_FS $CONFIG_EXPERIMENTAL
+dep_tristate 'Apple Macintosh file system support (EXPERIMENTAL)' CONFIG_HFS_FS $CONFIG_EXPERIMENTAL
 
-dep_tristate 'BFS filesystem support (EXPERIMENTAL)' CONFIG_BFS_FS $CONFIG_EXPERIMENTAL
+dep_tristate 'BFS file system support (EXPERIMENTAL)' CONFIG_BFS_FS $CONFIG_EXPERIMENTAL
 
-# msdos filesystems
+# msdos file systems
 tristate 'DOS FAT fs support' CONFIG_FAT_FS
 dep_tristate '  MSDOS fs support' CONFIG_MSDOS_FS $CONFIG_FAT_FS
-dep_tristate '    UMSDOS: Unix-like filesystem on top of standard MSDOS fs' CONFIG_UMSDOS_FS $CONFIG_MSDOS_FS
+dep_tristate '    UMSDOS: Unix-like file system on top of standard MSDOS fs' CONFIG_UMSDOS_FS $CONFIG_MSDOS_FS
 dep_tristate '  VFAT (Windows-95) fs support' CONFIG_VFAT_FS $CONFIG_FAT_FS
-dep_tristate 'EFS filesystem support (read only) (EXPERIMENTAL)' CONFIG_EFS_FS $CONFIG_EXPERIMENTAL
+dep_tristate 'EFS file system support (read only) (EXPERIMENTAL)' CONFIG_EFS_FS $CONFIG_EXPERIMENTAL
 
-tristate 'Compressed ROM filessytem support' CONFIG_CRAMFS
+tristate 'Compressed ROM file sytem support' CONFIG_CRAMFS
 
-tristate 'ISO 9660 CDROM filesystem support' CONFIG_ISO9660_FS
+tristate 'ISO 9660 CDROM file system support' CONFIG_ISO9660_FS
 if [ "$CONFIG_ISO9660_FS" != "n" ]; then
    bool '  Microsoft Joliet CDROM extensions' CONFIG_JOLIET
 else
@@ -36,44 +36,47 @@
 
 tristate 'Minix fs support' CONFIG_MINIX_FS
 
-tristate 'NTFS filesystem support (read only)' CONFIG_NTFS_FS
-dep_bool '  NTFS write support (DANGEROUS)' CONFIG_NTFS_RW $CONFIG_NTFS_FS $CONFIG_EXPERIMENTAL
+tristate 'NTFS file system support (read only)' CONFIG_NTFS_FS
+if [ "$CONFIG_NTFS_FS" != "n" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then
+   bool '  NTFS write support (DANGEROUS)' CONFIG_NTFS_RW
+fi
 
-tristate 'OS/2 HPFS filesystem support' CONFIG_HPFS_FS
+tristate 'OS/2 HPFS file system support' CONFIG_HPFS_FS
 
-bool '/proc filesystem support' CONFIG_PROC_FS
+bool '/proc file system support' CONFIG_PROC_FS
 
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-  bool '/dev filesystem support (EXPERIMENTAL)' CONFIG_DEVFS_FS
-  if [ "$CONFIG_DEVFS_FS" = "y" ]; then
-    bool '  Debug devfs' CONFIG_DEVFS_DEBUG
-  fi
-fi
+dep_bool '/dev file system support (EXPERIMENTAL)' CONFIG_DEVFS_FS $CONFIG_EXPERIMENTAL
+dep_bool '  Debug devfs' CONFIG_DEVFS_DEBUG $CONFIG_DEVFS_FS
 
 # It compiles as a module for testing only.  It should not be used
 # as a module in general.  If we make this "tristate", a bunch of people
 # who don't know what they are doing turn it on and complain when it
 # breaks.
-dep_bool '/dev/pts filesystem for Unix98 PTYs' CONFIG_DEVPTS_FS $CONFIG_UNIX98_PTYS
+dep_bool '/dev/pts file system for Unix98 PTYs' CONFIG_DEVPTS_FS $CONFIG_UNIX98_PTYS
 
-dep_tristate 'QNX4 filesystem support (read only) (EXPERIMENTAL)' CONFIG_QNX4FS_FS $CONFIG_EXPERIMENTAL
-dep_bool '  QNX4FS write support (DANGEROUS)' CONFIG_QNX4FS_RW $CONFIG_QNX4FS_FS
+dep_tristate 'QNX4 file system support (read only) (EXPERIMENTAL)' CONFIG_QNX4FS_FS $CONFIG_EXPERIMENTAL
+if [ "$CONFIG_QNX4FS_FS" != "n" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then
+   bool '  QNX4FS write support (DANGEROUS)' CONFIG_QNX4FS_RW
+fi
 
-tristate 'ROM filesystem support' CONFIG_ROMFS_FS
+tristate 'ROM file system support' CONFIG_ROMFS_FS
 
 tristate 'Second extended fs support' CONFIG_EXT2_FS
 
-tristate 'System V and Coherent filesystem support' CONFIG_SYSV_FS
-dep_bool '  SYSV filesystem write support (DANGEROUS)' CONFIG_SYSV_FS_WRITE $CONFIG_SYSV_FS $CONFIG_EXPERIMENTAL
+tristate 'System V and Coherent file system support (read only)' CONFIG_SYSV_FS
+if [ "$CONFIG_SYSV_FS" != "n" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then
+   bool '  SYSV file system write support (DANGEROUS)' CONFIG_SYSV_FS_WRITE
+fi
 
-tristate 'UDF filesystem support (read only)' CONFIG_UDF_FS
+tristate 'UDF file system support (read only)' CONFIG_UDF_FS
 if [ "$CONFIG_UDF_FS" != "n" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then
-  bool '  UDF write support (DANGEROUS)' CONFIG_UDF_RW
+   bool '  UDF write support (DANGEROUS)' CONFIG_UDF_RW
 fi
 
-tristate 'UFS filesystem support (read only)' CONFIG_UFS_FS
-dep_bool '  UFS filesystem write support (DANGEROUS)' CONFIG_UFS_FS_WRITE $CONFIG_UFS_FS $CONFIG_EXPERIMENTAL
-
+tristate 'UFS file system support (read only)' CONFIG_UFS_FS
+if [ "$CONFIG_UFS_FS" != "n" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then
+   bool '  UFS file system write support (DANGEROUS)' CONFIG_UFS_FS_WRITE
+fi
 
 if [ "$CONFIG_NET" = "y" ]; then
 
@@ -81,13 +84,15 @@
 comment 'Network File Systems'
 
 if [ "$CONFIG_INET" = "y" ]; then
-   tristate 'Coda filesystem support (advanced network fs)' CONFIG_CODA_FS
+   tristate 'Coda file system support (advanced network fs)' CONFIG_CODA_FS
 
-   tristate 'NFS filesystem support' CONFIG_NFS_FS
+   tristate 'NFS file system support' CONFIG_NFS_FS
    dep_bool '  Root file system on NFS' CONFIG_ROOT_NFS $CONFIG_NFS_FS $CONFIG_IP_PNP
 
    tristate 'NFS server support' CONFIG_NFSD
-   dep_bool '  Provide NFSv3 server support (EXPERIMENTAL)' CONFIG_NFSD_V3 $CONFIG_NFSD $CONFIG_EXPERIMENTAL
+   if [ "$CONFIG_NFSD" != "n" ]; then
+      bool '  Provide NFSv3 server support (EXPERIMENTAL)' CONFIG_NFSD_V3
+   fi
 
    if [ "$CONFIG_NFS_FS" = "y" -o "$CONFIG_NFSD" = "y" ]; then
       define_tristate CONFIG_SUNRPC y
@@ -101,10 +106,13 @@
 	 define_tristate CONFIG_LOCKD n
       fi
    fi
-   tristate 'SMB filesystem support (to mount WfW shares etc.)' CONFIG_SMB_FS
+   if [ "$CONFIG_NFSD_V3" = "y" ]; then
+     define_bool CONFIG_LOCKD_V4 y
+   fi
+   tristate 'SMB file system support (to mount Windows shares etc.)' CONFIG_SMB_FS
 fi
 if [ "$CONFIG_IPX" != "n" -o "$CONFIG_INET" != "n" ]; then
-   tristate 'NCP filesystem support (to mount NetWare volumes)' CONFIG_NCP_FS
+   tristate 'NCP file system support (to mount NetWare volumes)' CONFIG_NCP_FS
    if [ "$CONFIG_NCP_FS" != "n" ]; then
       source fs/ncpfs/Config.in
    fi