X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2FKconfig;h=ddc7462ddb56d12fd1f99e73d87a4b95d61262f5;hb=4bf311ddfbffe12d41ad1a3c311ab727db6f72cb;hp=6dc8cfd6d80cf7e57a73e1be4828b945667894d4;hpb=a144a5633c1e625c3134c2ce8d549a054468fd98;p=powerpc.git

diff --git a/fs/Kconfig b/fs/Kconfig
index 6dc8cfd6d8..ddc7462ddb 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -323,10 +323,11 @@ config FS_POSIX_ACL
 	default n
 
 source "fs/xfs/Kconfig"
+source "fs/gfs2/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 +357,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
@@ -1791,6 +1802,7 @@ config CIFS_POSIX
 
 config CIFS_DEBUG2
 	bool "Enable additional CIFS debugging routines"
+	depends on CIFS
 	help
 	   Enabling this option adds a few more debugging routines
 	   to the cifs code which slightly increases the size of
@@ -1919,6 +1931,7 @@ source "fs/partitions/Kconfig"
 endmenu
 
 source "fs/nls/Kconfig"
+source "fs/dlm/Kconfig"
 
 endmenu