nfsd4: reshuffle lease-setting code to allow reuse

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

diff --git a/fs/Kconfig b/fs/Kconfig
index ae3b34a..64d44ef 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -39,6 +39,14 @@ config FS_POSIX_ACL
        bool
        default n
 
        bool
        default n
 

+source "fs/xfs/Kconfig"
+source "fs/gfs2/Kconfig"
+source "fs/ocfs2/Kconfig"
+source "fs/btrfs/Kconfig"
+source "fs/nilfs2/Kconfig"
+
+endif # BLOCK
+

 config FILE_LOCKING
        bool "Enable POSIX file locking API" if EMBEDDED
        default y
 config FILE_LOCKING
        bool "Enable POSIX file locking API" if EMBEDDED
        default y


@@ -47,13 +55,6 @@ config FILE_LOCKING
           for filesystems like NFS and for the flock() system
           call. Disabling this option saves about 11k.
 
           for filesystems like NFS and for the flock() system
           call. Disabling this option saves about 11k.
 

-source "fs/xfs/Kconfig"
-source "fs/gfs2/Kconfig"
-source "fs/ocfs2/Kconfig"
-source "fs/btrfs/Kconfig"
-
-endif # BLOCK
-

 source "fs/notify/Kconfig"
 
 source "fs/quota/Kconfig"
 source "fs/notify/Kconfig"
 
 source "fs/quota/Kconfig"


@@ -62,10 +63,27 @@ source "fs/autofs/Kconfig"
 source "fs/autofs4/Kconfig"
 source "fs/fuse/Kconfig"
 
 source "fs/autofs4/Kconfig"
 source "fs/fuse/Kconfig"
 

+config CUSE
+       tristate "Character device in Userpace support"
+       depends on FUSE_FS
+       help
+         This FUSE extension allows character devices to be
+         implemented in userspace.
+
+         If you want to develop or use userspace character device
+         based on CUSE, answer Y or M.
+

 config GENERIC_ACL
        bool
        select FS_POSIX_ACL
 
 config GENERIC_ACL
        bool
        select FS_POSIX_ACL
 

+menu "Caches"
+
+source "fs/fscache/Kconfig"
+source "fs/cachefiles/Kconfig"
+
+endmenu
+

 if BLOCK
 menu "CD-ROM/DVD Filesystems"
 
 if BLOCK
 menu "CD-ROM/DVD Filesystems"
 


@@ -91,6 +109,7 @@ source "fs/sysfs/Kconfig"
 
 config TMPFS
        bool "Virtual memory file system support (former shm fs)"
 
 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.
 
        help
          Tmpfs is a file system which keeps all files in virtual memory.
 


@@ -116,8 +135,8 @@ config TMPFS_POSIX_ACL
 
 config HUGETLBFS
        bool "HugeTLB file system support"
 
 config HUGETLBFS
        bool "HugeTLB file system support"

-       depends on X86 || IA64 || PPC64 || SPARC64 || (SUPERH && MMU) || \
-                  (S390 && 64BIT) || 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
        help
          hugetlbfs is a filesystem backing for HugeTLB pages, based on
          ramfs. For architectures that support it, say Y here and read


@@ -168,7 +187,6 @@ source "fs/qnx4/Kconfig"
 source "fs/romfs/Kconfig"
 source "fs/sysv/Kconfig"
 source "fs/ufs/Kconfig"
 source "fs/romfs/Kconfig"
 source "fs/sysv/Kconfig"
 source "fs/ufs/Kconfig"

-

 source "fs/exofs/Kconfig"
 
 endif # MISC_FILESYSTEMS
 source "fs/exofs/Kconfig"
 
 endif # MISC_FILESYSTEMS


@@ -194,10 +212,12 @@ source "fs/nfsd/Kconfig"
 
 config LOCKD
        tristate
 
 config LOCKD
        tristate

+       depends on FILE_LOCKING

 
 config LOCKD_V4
        bool
        depends on NFSD_V3 || NFS_V3
 
 config LOCKD_V4
        bool
        depends on NFSD_V3 || NFS_V3

+       depends on FILE_LOCKING

        default y
 
 config EXPORTFS
        default y
 
 config EXPORTFS