1 files changed, 62 insertions, 66 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index 987b5d7cb21a..d7312825592b 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -463,40 +463,18 @@ config OCFS2_DEBUG_FS
           this option for debugging only as it is likely to decrease
           performance of the filesystem.
 
-config MINIX_FS
-        tristate "Minix fs support"
-        help
-          Minix is a simple operating system used in many classes about OS's.
-          The minix file system (method to organize files on a hard disk
-          partition or a floppy disk) was the original file system for Linux,
-          but has been superseded by the second extended file system ext2fs.
-          You don't want to use the minix file system on your hard disk
-          because of certain built-in restrictions, but it is sometimes found
-          on older Linux floppy disks.  This option will enlarge your kernel
-          by about 28 KB. If unsure, say N.
+endif # BLOCK
 
-          To compile this file system support as a module, choose M here: the
-          module will be called minix.  Note that the file system of your root
-          partition (the one containing the directory /) cannot be compiled as
-          a module.
-
-config ROMFS_FS
-        tristate "ROM file system support"
-        ---help---
-          This is a very small read-only file system mainly intended for
-          initial ram disks of installation disks, but it could be used for
-          other read-only media as well.  Read
-          <file:Documentation/filesystems/romfs.txt> for details.
-
-          To compile this file system support as a module, choose M here: the
-          module will be called romfs.  Note that the file system of your
-          root partition (the one containing the directory /) cannot be a
-          module.
-
-          If you don't know whether you need it, then you don't need it:
-          answer N.
+config DNOTIFY
+        bool "Dnotify support"
+        default y
+        help
+          Dnotify is a directory-based per-fd file change notification system
+          that uses signals to communicate events to user-space.  There exist
+          superior alternatives, but some applications may still rely on
+          dnotify.
 
-endif
+          If unsure, say Y.
 
 config INOTIFY
         bool "Inotify file change notification support"
@@ -577,17 +555,6 @@ config QUOTACTL
         depends on XFS_QUOTA || QUOTA
         default y
 
-config DNOTIFY
-        bool "Dnotify support"
-        default y
-        help
-          Dnotify is a directory-based per-fd file change notification system
-          that uses signals to communicate events to user-space.  There exist
-          superior alternatives, but some applications may still rely on
-          dnotify.
-
-          If unsure, say Y.
-
 config AUTOFS_FS
         tristate "Kernel automounter support"
         help
@@ -713,7 +680,7 @@ config UDF_NLS
         depends on (UDF_FS=m && NLS) || (UDF_FS=y && NLS=y)
 
 endmenu
-endif
+endif # BLOCK
 
 if BLOCK
 menu "DOS/FAT/NT Filesystems"
@@ -896,7 +863,7 @@ config NTFS_RW
           It is perfectly safe to say N here.
 
 endmenu
-endif
+endif # BLOCK
 
 menu "Pseudo filesystems"
 
@@ -1152,7 +1119,7 @@ config BEFS_DEBUG
         depends on BEFS_FS
         help
           If you say Y here, you can use the 'debug' mount option to enable
-          debugging output from the driver. 
+          debugging output from the driver.
 
 config BFS_FS
         tristate "BFS file system support (EXPERIMENTAL)"
@@ -1263,7 +1230,7 @@ config JFFS2_FS_XATTR
           Extended attributes are name:value pairs associated with inodes by
           the kernel or by users (see the attr(5) manual page, or visit
           <http://acl.bestbits.at/> for details).
-          
+
           If unsure, say N.
 
 config JFFS2_FS_POSIX_ACL
@@ -1274,10 +1241,10 @@ config JFFS2_FS_POSIX_ACL
         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
 
 config JFFS2_FS_SECURITY
@@ -1289,7 +1256,7 @@ config JFFS2_FS_SECURITY
           implemented by security modules like SELinux.  This option
           enables an extended attribute handler for file security
           labels in the jffs2 filesystem.
-          
+
           If you are not using a security module that requires using
           extended attributes for file security labels, say N.
 
@@ -1417,6 +1384,24 @@ config VXFS_FS
           To compile this as a module, choose M here: the module will be
           called freevxfs.  If unsure, say N.
 
+config MINIX_FS
+        tristate "Minix file system support"
+        depends on BLOCK
+        help
+          Minix is a simple operating system used in many classes about OS's.
+          The minix file system (method to organize files on a hard disk
+          partition or a floppy disk) was the original file system for Linux,
+          but has been superseded by the second extended file system ext2fs.
+          You don't want to use the minix file system on your hard disk
+          because of certain built-in restrictions, but it is sometimes found
+          on older Linux floppy disks.  This option will enlarge your kernel
+          by about 28 KB. If unsure, say N.
+
+          To compile this file system support as a module, choose M here: the
+          module will be called minix.  Note that the file system of your root
+          partition (the one containing the directory /) cannot be compiled as
+          a module.
+
 
 config HPFS_FS
         tristate "OS/2 HPFS file system support"
@@ -1434,7 +1419,6 @@ config HPFS_FS
           module will be called hpfs.  If unsure, say N.
 
 
-
 config QNX4FS_FS
         tristate "QNX4 file system support (read only)"
         depends on BLOCK
@@ -1461,6 +1445,22 @@ config QNX4FS_RW
           It's currently broken, so for now:
           answer N.
 
+config ROMFS_FS
+        tristate "ROM file system support"
+        depends on BLOCK
+        ---help---
+          This is a very small read-only file system mainly intended for
+          initial ram disks of installation disks, but it could be used for
+          other read-only media as well.  Read
+          <file:Documentation/filesystems/romfs.txt> for details.
+
+          To compile this file system support as a module, choose M here: the
+          module will be called romfs.  Note that the file system of your
+          root partition (the one containing the directory /) cannot be a
+          module.
+
+          If you don't know whether you need it, then you don't need it:
+          answer N.
 
 
 config SYSV_FS
@@ -1501,7 +1501,6 @@ config SYSV_FS
           If you haven't heard about all of this before, it's safe to say N.
 
 
-
 config UFS_FS
         tristate "UFS file system support (read only)"
         depends on BLOCK
@@ -1779,12 +1778,9 @@ config SUNRPC_GSS
         tristate
 
 config SUNRPC_XPRT_RDMA
-        tristate "RDMA transport for sunrpc (EXPERIMENTAL)"
+        tristate
         depends on SUNRPC && INFINIBAND && EXPERIMENTAL
-        default m
-        help
-          Adds a client RPC transport for supporting kernel NFS over RDMA
-          mounts, including Infiniband and iWARP. Experimental.
+        default SUNRPC && INFINIBAND
 
 config SUNRPC_BIND34
         bool "Support for rpcbind versions 3 & 4 (EXPERIMENTAL)"
@@ -1835,7 +1831,7 @@ config RPCSEC_GSS_SPKM3
           If unsure, say N.
 
 config SMB_FS
-        tristate "SMB file system support (to mount Windows shares etc.)"
+        tristate "SMB file system support (OBSOLETE, please use CIFS)"
         depends on INET
         select NLS
         help
@@ -1858,8 +1854,8 @@ config SMB_FS
           General information about how to connect Linux, Windows machines and
           Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>.
 
-          To compile the SMB support as a module, choose M here: the module will
-          be called smbfs.  Most people say N, however.
+          To compile the SMB support as a module, choose M here:
+          the module will be called smbfs.  Most people say N, however.
 
 config SMB_NLS_DEFAULT
         bool "Use a default NLS"
@@ -1891,7 +1887,7 @@ config SMB_NLS_REMOTE
           smbmount from samba 2.2.0 or later supports this.
 
 config CIFS
-        tristate "CIFS support (advanced network filesystem for Samba, Window and other CIFS compliant servers)"
+        tristate "CIFS support (advanced network filesystem, SMBFS successor)"
         depends on INET
         select NLS
         help
@@ -1949,16 +1945,16 @@ config CIFS_WEAK_PW_HASH
           LANMAN based servers such as OS/2 and Windows 95, but such
           mounts may be less secure than mounts using NTLM or more recent
           security mechanisms if you are on a public network.  Unless you
-          have a need to access old SMB servers (and are on a private 
+          have a need to access old SMB servers (and are on a private
           network) you probably want to say N.  Even if this support
           is enabled in the kernel build, LANMAN authentication will not be
           used automatically. At runtime LANMAN mounts are disabled but
           can be set to required (or optional) either in
           /proc/fs/cifs (see fs/cifs/README for more detail) or via an
-          option on the mount command. This support is disabled by 
+          option on the mount command. This support is disabled by
           default in order to reduce the possibility of a downgrade
           attack.
- 
+
           If unsure, say N.
 
 config CIFS_XATTR
@@ -1999,7 +1995,7 @@ config CIFS_DEBUG2
            messages in some error paths, slowing performance. This
            option can be turned off unless you are debugging
            cifs problems.  If unsure, say N.
-           
+
 config CIFS_EXPERIMENTAL
           bool "CIFS Experimental Features (EXPERIMENTAL)"
           depends on CIFS && EXPERIMENTAL
@@ -2090,7 +2086,7 @@ config CODA_FS_OLD_API
           However this new API is not backward compatible with older
           clients. If you really need to run the old Coda userspace
           cache manager then say Y.
-          
+
           For most cases you probably want to say N.
 
 config AFS_FS