From 3236a399d8d6d8aa40cc6fb39a5482a1f8485c64 Mon Sep 17 00:00:00 2001
From: Joel Becker <joel.becker@oracle.com>
Date: Tue, 4 Mar 2008 17:58:56 -0800
Subject: [PATCH] --- yaml --- r: 89573 b: refs/heads/master c:
 9341d22942d63d6a1e4cc90f246980dbb7e1ca94 h: refs/heads/master i:   89571:
 500c9e9d4d174f3a8acf2a84007a983d69160458 v: v3

---
 [refs]                  |  2 +-
 trunk/fs/Kconfig        | 26 ++++++++++++++++++++++++++
 trunk/fs/ocfs2/Makefile | 10 ++++++----
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d07a92657029..474737245ffb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b92eccdd28e1e3870a5b2aa625282c9ae8e35cec
+refs/heads/master: 9341d22942d63d6a1e4cc90f246980dbb7e1ca94
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
index c509123bea49..028ae38ecc52 100644
--- a/trunk/fs/Kconfig
+++ b/trunk/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
diff --git a/trunk/fs/ocfs2/Makefile b/trunk/fs/ocfs2/Makefile
index b8d6d0225737..f6956de56fdb 100644
--- a/trunk/fs/ocfs2/Makefile
+++ b/trunk/fs/ocfs2/Makefile
@@ -4,9 +4,10 @@ EXTRA_CFLAGS += -DCATCH_BH_JBD_RACES
 
 obj-$(CONFIG_OCFS2_FS) += 	\
 	ocfs2.o			\
-	ocfs2_stackglue.o	\
-	ocfs2_stack_o2cb.o	\
-	ocfs2_stack_user.o
+	ocfs2_stackglue.o
+
+obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_stack_o2cb.o
+obj-$(CONFIG_OCFS2_FS_USERSPACE_CLUSTER) += ocfs2_stack_user.o
 
 ocfs2-objs := \
 	alloc.o 		\
@@ -39,5 +40,6 @@ ocfs2_stackglue-objs := stackglue.o
 ocfs2_stack_o2cb-objs := stack_o2cb.o
 ocfs2_stack_user-objs := stack_user.o
 
+# cluster/ is always needed when OCFS2_FS for masklog support
 obj-$(CONFIG_OCFS2_FS) += cluster/
-obj-$(CONFIG_OCFS2_FS) += dlm/
+obj-$(CONFIG_OCFS2_FS_O2CB) += dlm/