diff options
Diffstat (limited to 'fs/Kconfig')
-rw-r--r-- | fs/Kconfig | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 42cfb7dc95b5..9acccda4fd6b 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
@@ -251,7 +251,7 @@ config JBD2 | |||
251 | 251 | ||
252 | config JBD2_DEBUG | 252 | config JBD2_DEBUG |
253 | bool "JBD2 (ext4dev/ext4) debugging support" | 253 | bool "JBD2 (ext4dev/ext4) debugging support" |
254 | depends on JBD2 | 254 | depends on JBD2 && DEBUG_FS |
255 | help | 255 | help |
256 | If you are using the ext4dev/ext4 journaled file system (or | 256 | If you are using the ext4dev/ext4 journaled file system (or |
257 | potentially any other filesystem/device using JBD2), this option | 257 | potentially any other filesystem/device using JBD2), this option |
@@ -260,10 +260,10 @@ config JBD2_DEBUG | |||
260 | By default, the debugging output will be turned off. | 260 | By default, the debugging output will be turned off. |
261 | 261 | ||
262 | If you select Y here, then you will be able to turn on debugging | 262 | If you select Y here, then you will be able to turn on debugging |
263 | with "echo N > /proc/sys/fs/jbd2-debug", where N is a number between | 263 | with "echo N > /sys/kernel/debug/jbd2/jbd2-debug", where N is a |
264 | 1 and 5. The higher the number, the more debugging output is | 264 | number between 1 and 5. The higher the number, the more debugging |
265 | generated. To turn debugging off again, do | 265 | output is generated. To turn debugging off again, do |
266 | "echo 0 > /proc/sys/fs/jbd2-debug". | 266 | "echo 0 > /sys/kernel/debug/jbd2/jbd2-debug". |
267 | 267 | ||
268 | config FS_MBCACHE | 268 | config FS_MBCACHE |
269 | # Meta block cache for Extended Attributes (ext2/ext3/ext4) | 269 | # Meta block cache for Extended Attributes (ext2/ext3/ext4) |
@@ -991,7 +991,7 @@ config TMPFS_POSIX_ACL | |||
991 | 991 | ||
992 | config HUGETLBFS | 992 | config HUGETLBFS |
993 | bool "HugeTLB file system support" | 993 | bool "HugeTLB file system support" |
994 | depends on X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN | 994 | depends on X86 || IA64 || PPC64 || SPARC64 || (SUPERH && MMU) || BROKEN |
995 | help | 995 | help |
996 | hugetlbfs is a filesystem backing for HugeTLB pages, based on | 996 | hugetlbfs is a filesystem backing for HugeTLB pages, based on |
997 | ramfs. For architectures that support it, say Y here and read | 997 | ramfs. For architectures that support it, say Y here and read |
@@ -1700,7 +1700,8 @@ config NFSD_V3_ACL | |||
1700 | 1700 | ||
1701 | config NFSD_V4 | 1701 | config NFSD_V4 |
1702 | bool "Provide NFSv4 server support (EXPERIMENTAL)" | 1702 | bool "Provide NFSv4 server support (EXPERIMENTAL)" |
1703 | depends on NFSD_V3 && EXPERIMENTAL | 1703 | depends on NFSD && NFSD_V3 && EXPERIMENTAL |
1704 | select RPCSEC_GSS_KRB5 | ||
1704 | help | 1705 | help |
1705 | If you would like to include the NFSv4 server as well as the NFSv2 | 1706 | If you would like to include the NFSv4 server as well as the NFSv2 |
1706 | and NFSv3 servers, say Y here. This feature is experimental, and | 1707 | and NFSv3 servers, say Y here. This feature is experimental, and |
@@ -2074,7 +2075,7 @@ config AFS_DEBUG | |||
2074 | 2075 | ||
2075 | config 9P_FS | 2076 | config 9P_FS |
2076 | tristate "Plan 9 Resource Sharing Support (9P2000) (Experimental)" | 2077 | tristate "Plan 9 Resource Sharing Support (9P2000) (Experimental)" |
2077 | depends on INET && EXPERIMENTAL | 2078 | depends on INET && NET_9P && EXPERIMENTAL |
2078 | help | 2079 | help |
2079 | If you say Y here, you will get experimental support for | 2080 | If you say Y here, you will get experimental support for |
2080 | Plan 9 resource sharing via the 9P2000 protocol. | 2081 | Plan 9 resource sharing via the 9P2000 protocol. |