Update of /cvsroot/gc-linux/linux/fs
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/fs
Modified Files:
Kconfig
Log Message:
Forward to v2.6.31.
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/fs/Kconfig,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Kconfig 25 Oct 2009 18:45:36 -0000 1.16
--- Kconfig 25 Oct 2009 18:56:56 -0000 1.17
***************
*** 40,43 ****
--- 40,50 ----
default n
+ source "fs/xfs/Kconfig"
+ source "fs/gfs2/Kconfig"
+ source "fs/ocfs2/Kconfig"
+ source "fs/btrfs/Kconfig"
+
+ endif # BLOCK
+
config FILE_LOCKING
bool "Enable POSIX file locking API" if EMBEDDED
***************
*** 48,58 ****
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"
--- 55,58 ----
***************
*** 63,66 ****
--- 63,76 ----
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
***************
*** 125,129 ****
bool "HugeTLB file system support"
depends on X86 || IA64 || PPC64 || SPARC64 || (SUPERH && MMU) || \
! (S390 && 64BIT) || BROKEN
help
hugetlbfs is a filesystem backing for HugeTLB pages, based on
--- 135,139 ----
bool "HugeTLB file system support"
depends on X86 || IA64 || PPC64 || SPARC64 || (SUPERH && MMU) || \
! (S390 && 64BIT) || SYS_SUPPORTS_HUGETLBFS || BROKEN
help
hugetlbfs is a filesystem backing for HugeTLB pages, based on
***************
*** 177,206 ****
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
--- 187,191 ----
source "fs/ufs/Kconfig"
source "fs/exofs/Kconfig"
! source "fs/nilfs2/Kconfig"
endif # MISC_FILESYSTEMS
***************
*** 227,234 ****
--- 212,221 ----
config LOCKD
tristate
+ depends on FILE_LOCKING
config LOCKD_V4
bool
depends on NFSD_V3 || NFS_V3
+ depends on FILE_LOCKING
default y
|
