aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Fasheh <mark.fasheh@oracle.com>2005-12-15 17:31:24 -0500
committerJoel Becker <joel.becker@oracle.com>2006-01-03 14:45:48 -0500
commitb4e40a51881931bfcbc78a585e875bb2784d6d10 (patch)
treea874485dafacc0896c3b355efa079f7e93a450fd
parentccd979bdbce9fba8412beb3f1de68a9d0171b12c (diff)
[PATCH] OCFS2: The Second Oracle Cluster Filesystem
Link the code into the kernel build system. OCFS2 is marked as experimental. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com> Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
-rw-r--r--fs/Kconfig53
-rw-r--r--fs/Makefile1
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
70 70
71config EXT3_FS 71config EXT3_FS
72 tristate "Ext3 journalling file system support" 72 tristate "Ext3 journalling file system support"
73 select JBD
73 help 74 help
74 This is the journaling version of the Second extended file system 75 This is the journaling version of the Second extended file system
75 (often called ext3), the de facto standard Linux file system 76 (often called ext3), the de facto standard Linux file system
@@ -138,23 +139,20 @@ config EXT3_FS_SECURITY
138 extended attributes for file security labels, say N. 139 extended attributes for file security labels, say N.
139 140
140config JBD 141config JBD
141# CONFIG_JBD could be its own option (even modular), but until there are
142# other users than ext3, we will simply make it be the same as CONFIG_EXT3_FS
143# dep_tristate ' Journal Block Device support (JBD for ext3)' CONFIG_JBD $CONFIG_EXT3_FS
144 tristate 142 tristate
145 default EXT3_FS
146 help 143 help
147 This is a generic journaling layer for block devices. It is 144 This is a generic journaling layer for block devices. It is
148 currently used by the ext3 file system, but it could also be used to 145 currently used by the ext3 and OCFS2 file systems, but it could
149 add journal support to other file systems or block devices such as 146 also be used to add journal support to other file systems or block
150 RAID or LVM. 147 devices such as RAID or LVM.
151 148
152 If you are using the ext3 file system, you need to say Y here. If 149 If you are using the ext3 or OCFS2 file systems, you need to
153 you are not using ext3 then you will probably want to say N. 150 say Y here. If you are not using ext3 OCFS2 then you will probably
151 want to say N.
154 152
155 To compile this device as a module, choose M here: the module will be 153 To compile this device as a module, choose M here: the module will be
156 called jbd. If you are compiling ext3 into the kernel, you cannot 154 called jbd. If you are compiling ext3 or OCFS2 into the kernel,
157 compile this code as a module. 155 you cannot compile this code as a module.
158 156
159config JBD_DEBUG 157config JBD_DEBUG
160 bool "JBD (ext3) debugging support" 158 bool "JBD (ext3) debugging support"
@@ -326,6 +324,39 @@ config FS_POSIX_ACL
326 324
327source "fs/xfs/Kconfig" 325source "fs/xfs/Kconfig"
328 326
327config OCFS2_FS
328 tristate "OCFS2 file system support (EXPERIMENTAL)"
329 depends on NET && EXPERIMENTAL
330 select CONFIGFS_FS
331 select JBD
332 select CRC32
333 select INET
334 help
335 OCFS2 is a general purpose extent based shared disk cluster file
336 system with many similarities to ext3. It supports 64 bit inode
337 numbers, and has automatically extending metadata groups which may
338 also make it attractive for non-clustered use.
339
340 You'll want to install the ocfs2-tools package in order to at least
341 get "mount.ocfs2".
342
343 Project web page: http://oss.oracle.com/projects/ocfs2
344 Tools web page: http://oss.oracle.com/projects/ocfs2-tools
345 OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/
346
347 Note: Features which OCFS2 does not support yet:
348 - extended attributes
349 - readonly mount
350 - shared writeable mmap
351 - loopback is supported, but data written will not
352 be cluster coherent.
353 - quotas
354 - cluster aware flock
355 - Directory change notification (F_NOTIFY)
356 - Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)
357 - POSIX ACLs
358 - readpages / writepages (not user visible)
359
329config MINIX_FS 360config MINIX_FS
330 tristate "Minix fs support" 361 tristate "Minix fs support"
331 help 362 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/
102obj-$(CONFIG_HPPFS) += hppfs/ 102obj-$(CONFIG_HPPFS) += hppfs/
103obj-$(CONFIG_DEBUG_FS) += debugfs/ 103obj-$(CONFIG_DEBUG_FS) += debugfs/
104obj-$(CONFIG_CONFIGFS_FS) += configfs/ 104obj-$(CONFIG_CONFIGFS_FS) += configfs/
105obj-$(CONFIG_OCFS2_FS) += ocfs2/