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: Joel Becker <joel.becker@oracle.com> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
parent
b92eccdd28
commit
9341d22942
26
fs/Kconfig
26
fs/Kconfig
|
@ -444,6 +444,32 @@ config OCFS2_FS
|
||||||
For more information on OCFS2, see the file
|
For more information on OCFS2, see the file
|
||||||
<file:Documentation/filesystems/ocfs2.txt>.
|
<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
|
config OCFS2_DEBUG_MASKLOG
|
||||||
bool "OCFS2 logging support"
|
bool "OCFS2 logging support"
|
||||||
depends on OCFS2_FS
|
depends on OCFS2_FS
|
||||||
|
|
|
@ -4,9 +4,10 @@ EXTRA_CFLAGS += -DCATCH_BH_JBD_RACES
|
||||||
|
|
||||||
obj-$(CONFIG_OCFS2_FS) += \
|
obj-$(CONFIG_OCFS2_FS) += \
|
||||||
ocfs2.o \
|
ocfs2.o \
|
||||||
ocfs2_stackglue.o \
|
ocfs2_stackglue.o
|
||||||
ocfs2_stack_o2cb.o \
|
|
||||||
ocfs2_stack_user.o
|
obj-$(CONFIG_OCFS2_FS_O2CB) += ocfs2_stack_o2cb.o
|
||||||
|
obj-$(CONFIG_OCFS2_FS_USERSPACE_CLUSTER) += ocfs2_stack_user.o
|
||||||
|
|
||||||
ocfs2-objs := \
|
ocfs2-objs := \
|
||||||
alloc.o \
|
alloc.o \
|
||||||
|
@ -39,5 +40,6 @@ ocfs2_stackglue-objs := stackglue.o
|
||||||
ocfs2_stack_o2cb-objs := stack_o2cb.o
|
ocfs2_stack_o2cb-objs := stack_o2cb.o
|
||||||
ocfs2_stack_user-objs := stack_user.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) += cluster/
|
||||||
obj-$(CONFIG_OCFS2_FS) += dlm/
|
obj-$(CONFIG_OCFS2_FS_O2CB) += dlm/
|
||||||
|
|
Loading…
Reference in New Issue