Update of /cvsroot/linux-vax/kernel-2.5/fs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17749/fs
Modified Files:
Kconfig Makefile
Log Message:
Merge with 2.6.9
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/fs/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 19 Sep 2004 09:54:58 -0000 1.2
+++ Makefile 17 Nov 2004 00:24:36 -0000 1.3
@@ -92,3 +92,5 @@
obj-$(CONFIG_AFS_FS) += afs/
obj-$(CONFIG_BEFS_FS) += befs/
obj-$(CONFIG_ODS2_FS) += ods2/
+obj-$(CONFIG_HOSTFS) += hostfs/
+obj-$(CONFIG_HPPFS) += hppfs/
Index: Kconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/fs/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kconfig 19 Sep 2004 09:54:58 -0000 1.2
+++ Kconfig 17 Nov 2004 00:24:36 -0000 1.3
@@ -289,7 +289,7 @@
# Never use this symbol for ifdefs.
#
bool
- depends on EXT2_FS_POSIX_ACL || EXT3_FS_POSIX_ACL || JFS_POSIX_ACL || REISERFS_FS_POSIX_ACL
+ depends on EXT2_FS_POSIX_ACL || EXT3_FS_POSIX_ACL || JFS_POSIX_ACL || REISERFS_FS_POSIX_ACL || NFSD_V4
default y
config XFS_FS
@@ -650,18 +650,21 @@
default 437
help
This option should be set to the codepage of your FAT filesystems.
- It can be overridden with the 'codepage' mount option.
+ It can be overridden with the "codepage" mount option.
+ See <file:Documentation/filesystems/vfat.txt> for more information.
config FAT_DEFAULT_IOCHARSET
string "Default iocharset for FAT"
depends on VFAT_FS
default "iso8859-1"
help
- Set this to the default I/O character set you'd like FAT to use.
- It should probably match the character set that most of your
- FAT filesystems use, and can be overridded with the 'iocharset'
- mount option for FAT filesystems. Note that UTF8 is *not* a
- supported charset for FAT filesystems.
+ Set this to the default input/output character set you'd
+ like FAT to use. It should probably match the character set
+ that most of your FAT filesystems use, and can be overridden
+ with the "iocharset" mount option for FAT filesystems.
+ Note that "utf8" is not recommended for FAT filesystems.
+ If unsure, you shouldn't set "utf8" here.
+ See <file:Documentation/filesystems/vfat.txt> for more information.
config UMSDOS_FS
#dep_tristate ' UMSDOS: Unix-like file system on top of standard MSDOS fs' CONFIG_UMSDOS_FS $CONFIG_MSDOS_FS
@@ -1213,7 +1216,7 @@
endchoice
config CRAMFS
- tristate "Compressed ROM file system support"
+ tristate "Compressed ROM file system support (cramfs)"
select ZLIB_INFLATE
help
Saying Y here includes support for CramFs (Compressed ROM File
@@ -1423,8 +1426,8 @@
bool "Provide NFSv3 client support"
depends on NFS_FS
help
- Say Y here if you want your NFS client to be able to speak the newer
- version 3 of the NFS protocol.
+ Say Y here if you want your NFS client to be able to speak version
+ 3 of the NFS protocol.
If unsure, say Y.
@@ -1503,6 +1506,7 @@
config NFSD_V4
bool "Provide NFSv4 server support (EXPERIMENTAL)"
depends on NFSD_V3 && EXPERIMENTAL
+ select NFSD_TCP
help
If you would like to include the NFSv4 server as well as the NFSv2
and NFSv3 servers, say Y here. This feature is experimental, and
@@ -1567,6 +1571,22 @@
If unsure, say N.
+config RPCSEC_GSS_SPKM3
+ tristate "Secure RPC: SPKM3 mechanism (EXPERIMENTAL)"
+ depends on SUNRPC && EXPERIMENTAL
+ select SUNRPC_GSS
+ select CRYPTO
+ select CRYPTO_MD5
+ select CRYPTO_DES
+ help
+ Provides for secure RPC calls by means of a gss-api
+ mechanism based on the SPKM3 public-key mechanism.
+
+ Note: Requires an auxiliary userspace daemon which may be found on
+ http://www.citi.umich.edu/projects/nfsv4/
+
+ If unsure, say N.
+
config SMB_FS
tristate "SMB file system support (to mount Windows shares etc.)"
depends on INET
|
