nfsd4: reshuffle lease-setting code to allow reuse

[safe/jmp/linux-2.6] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index d78e950..64d44ef 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -43,6 +43,7 @@ source "fs/xfs/Kconfig"
 source "fs/gfs2/Kconfig"
 source "fs/ocfs2/Kconfig"
 source "fs/btrfs/Kconfig"
+source "fs/nilfs2/Kconfig"
 
 endif # BLOCK
 
@@ -108,6 +109,7 @@ source "fs/sysfs/Kconfig"
 
 config TMPFS
        bool "Virtual memory file system support (former shm fs)"
+       depends on SHMEM
        help
          Tmpfs is a file system which keeps all files in virtual memory.
 
@@ -133,8 +135,8 @@ config TMPFS_POSIX_ACL
 
 config HUGETLBFS
        bool "HugeTLB file system support"
-       depends on X86 || IA64 || PPC64 || SPARC64 || (SUPERH && MMU) || \
-                  (S390 && 64BIT) || SYS_SUPPORTS_HUGETLBFS || BROKEN
+       depends on X86 || IA64 || SPARC64 || (S390 && 64BIT) || \
+                  SYS_SUPPORTS_HUGETLBFS || BROKEN
        help
          hugetlbfs is a filesystem backing for HugeTLB pages, based on
          ramfs. For architectures that support it, say Y here and read
@@ -187,32 +189,6 @@ source "fs/sysv/Kconfig"
 source "fs/ufs/Kconfig"
 source "fs/exofs/Kconfig"
 
-config NILFS2_FS
-       tristate "NILFS2 file system support (EXPERIMENTAL)"
-       depends on BLOCK && EXPERIMENTAL
-       select CRC32
-       help
-         NILFS2 is a log-structured file system (LFS) supporting continuous
-         snapshotting.  In addition to versioning capability of the entire
-         file system, users can even restore files mistakenly overwritten or
-         destroyed just a few seconds ago.  Since this file system can keep
-         consistency like conventional LFS, it achieves quick recovery after
-         system crashes.
-
-         NILFS2 creates a number of checkpoints every few seconds or per
-         synchronous write basis (unless there is no change).  Users can
-         select significant versions among continuously created checkpoints,
-         and can change them into snapshots which will be preserved for long
-         periods until they are changed back to checkpoints.  Each
-         snapshot is mountable as a read-only file system concurrently with
-         its writable mount, and this feature is convenient for online backup.
-
-         Some features including atime, extended attributes, and POSIX ACLs,
-         are not supported yet.
-
-         To compile this file system support as a module, choose M here: the
-         module will be called nilfs2.  If unsure, say N.
-
 endif # MISC_FILESYSTEMS
 
 menuconfig NETWORK_FILESYSTEMS
@@ -236,10 +212,12 @@ source "fs/nfsd/Kconfig"
 
 config LOCKD
        tristate
+       depends on FILE_LOCKING
 
 config LOCKD_V4
        bool
        depends on NFSD_V3 || NFS_V3
+       depends on FILE_LOCKING
        default y
 
 config EXPORTFS