2 files changed, 43 insertions, 11 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index ba1dbe2b2202..59b179559312 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -70,6 +70,7 @@ config FS_XIP
 
 config EXT3_FS
         tristate "Ext3 journalling file system support"
+        select JBD
         help
           This is the journaling version of the Second extended file system
           (often called ext3), the de facto standard Linux file system
@@ -138,23 +139,20 @@ config EXT3_FS_SECURITY
           extended attributes for file security labels, say N.
 
 config JBD
-# CONFIG_JBD could be its own option (even modular), but until there are
-# other users than ext3, we will simply make it be the same as CONFIG_EXT3_FS
-# dep_tristate '  Journal Block Device support (JBD for ext3)' CONFIG_JBD $CONFIG_EXT3_FS
         tristate
-        default EXT3_FS
         help
           This is a generic journaling layer for block devices.  It is
-          currently used by the ext3 file system, but it could also be used to
-          add journal support to other file systems or block devices such as
-          RAID or LVM.
+          currently used by the ext3 and OCFS2 file systems, but it could
+          also be used to add journal support to other file systems or block
+          devices such as RAID or LVM.
 
-          If you are using the ext3 file system, you need to say Y here. If
-          you are not using ext3 then you will probably want to say N.
+          If you are using the ext3 or OCFS2 file systems, you need to
+          say Y here. If you are not using ext3 OCFS2 then you will probably
+          want to say N.
 
           To compile this device as a module, choose M here: the module will be
-          called jbd.  If you are compiling ext3 into the kernel, you cannot
-          compile this code as a module.
+          called jbd.  If you are compiling ext3 or OCFS2 into the kernel,
+          you cannot compile this code as a module.
 
 config JBD_DEBUG
         bool "JBD (ext3) debugging support"
@@ -326,6 +324,39 @@ config FS_POSIX_ACL
 
 source "fs/xfs/Kconfig"
 
+config OCFS2_FS
+        tristate "OCFS2 file system support (EXPERIMENTAL)"
+        depends on NET && EXPERIMENTAL
+        select CONFIGFS_FS
+        select JBD
+        select CRC32
+        select INET
+        help
+          OCFS2 is a general purpose extent based shared disk cluster file
+          system with many similarities to ext3. It supports 64 bit inode
+          numbers, and has automatically extending metadata groups which may
+          also make it attractive for non-clustered use.
+
+          You'll want to install the ocfs2-tools package in order to at least
+          get "mount.ocfs2".
+
+          Project web page:    http://oss.oracle.com/projects/ocfs2
+          Tools web page:      http://oss.oracle.com/projects/ocfs2-tools
+          OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/
+
+          Note: Features which OCFS2 does not support yet:
+                  - extended attributes
+                  - readonly mount
+                  - shared writeable mmap
+                  - loopback is supported, but data written will not
+                    be cluster coherent.
+                  - quotas
+                  - cluster aware flock
+                  - Directory change notification (F_NOTIFY)
+                  - Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)
+                  - POSIX ACLs
+                  - readpages / writepages (not user visible)
+
 config MINIX_FS
         tristate "Minix fs support"
         help
diff --git a/fs/Makefile b/fs/Makefile
index ff3d48a744f5..73676111ebbe 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -102,3 +102,4 @@ obj-$(CONFIG_HOSTFS)		+= hostfs/
 obj-$(CONFIG_HPPFS)             += hppfs/
 obj-$(CONFIG_DEBUG_FS)          += debugfs/
 obj-$(CONFIG_CONFIGFS_FS)       += configfs/
+obj-$(CONFIG_OCFS2_FS)          += ocfs2/