Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9341d229 authored by Joel Becker's avatar Joel Becker Committed by Mark Fasheh
Browse files

ocfs2: Allow selection of cluster plug-ins. 



ocfs2 now supports plug-ins for the classic O2CB stack as well as
userspace cluster stacks in conjunction with fs/dlm.  This allows zero,
one, or both of the plug-ins to be selected in Kconfig.  For local mounts
(non-clustered), neither plug-in is needed.  Both plugins can be loaded
at one time, the runtime will select the one needed for the cluster
systme in use.

Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent b92eccdd

fs/Kconfig

+26 −0
Original line number Diff line number Diff line
@@ -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

fs/ocfs2/Makefile

+6 −4
Original line number Diff line number Diff line
@@ -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/