Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

1 files changed, 11 insertions, 1 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index 6dc8cfd6d80c..53f5c6d61121 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -326,7 +326,7 @@ source "fs/xfs/Kconfig"
 
 config OCFS2_FS
         tristate "OCFS2 file system support (EXPERIMENTAL)"
-        depends on NET && EXPERIMENTAL
+        depends on NET && SYSFS && EXPERIMENTAL
         select CONFIGFS_FS
         select JBD
         select CRC32
@@ -356,6 +356,16 @@ config OCFS2_FS
                   - POSIX ACLs
                   - readpages / writepages (not user visible)
 
+config OCFS2_DEBUG_MASKLOG
+        bool "OCFS2 logging support"
+        depends on OCFS2_FS
+        default y
+        help
+          The ocfs2 filesystem has an extensive logging system.  The system
+          allows selection of events to log via files in /sys/o2cb/logmask/.
+          This option will enlarge your kernel, but it allows debugging of
+          ocfs2 filesystem issues.
+
 config MINIX_FS
         tristate "Minix fs support"
         help