Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 30 insertions, 4 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index d7312825592b..028ae38ecc52 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -444,6 +444,32 @@ config OCFS2_FS
           For more information on OCFS2, see the file
           <file:Documentation/filesystems/ocfs2.txt>.
 
+config OCFS2_FS_O2CB
+        tristate "O2CB Kernelspace Clustering"
+        depends on OCFS2_FS
+        default y
+        help
+          OCFS2 includes a simple kernelspace clustering package, the OCFS2
+          Cluster Base.  It only requires a very small userspace component
+          to configure it. This comes with the standard ocfs2-tools package.
+          O2CB is limited to maintaining a cluster for OCFS2 file systems.
+          It cannot manage any other cluster applications.
+
+          It is always safe to say Y here, as the clustering method is
+          run-time selectable.
+
+config OCFS2_FS_USERSPACE_CLUSTER
+        tristate "OCFS2 Userspace Clustering"
+        depends on OCFS2_FS && DLM
+        default y
+        help
+          This option will allow OCFS2 to use userspace clustering services
+          in conjunction with the DLM in fs/dlm.  If you are using a
+          userspace cluster manager, say Y here.
+
+          It is safe to say Y, as the clustering method is run-time
+          selectable.
+
 config OCFS2_DEBUG_MASKLOG
         bool "OCFS2 logging support"
         depends on OCFS2_FS
@@ -1744,10 +1770,10 @@ config ROOT_NFS
           If you want your Linux box to mount its whole root file system (the
           one containing the directory /) from some other computer over the
           net via NFS (presumably because your box doesn't have a hard disk),
-          say Y. Read <file:Documentation/nfsroot.txt> for details. It is
-          likely that in this case, you also want to say Y to "Kernel level IP
-          autoconfiguration" so that your box can discover its network address
-          at boot time.
+          say Y. Read <file:Documentation/filesystems/nfsroot.txt> for
+          details. It is likely that in this case, you also want to say Y to
+          "Kernel level IP autoconfiguration" so that your box can discover
+          its network address at boot time.
 
           Most people say N here.