CVS: linux/fs Config.in,1.3,1.4 Makefile,1.3,1.4

Update of /cvsroot/linux-hfsplus/linux/fs
In directory sc8-pr-cvs1:/tmp/cvs-serv30627/fs

Modified Files:
	Config.in Makefile 
Log Message:
Merged 2.4.19 to 2.4.21 changes


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-hfsplus/linux/fs/Config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Config.in	8 May 2002 03:01:47 -0000	1.3
--- Config.in	29 Apr 2003 06:38:46 -0000	1.4
***************
*** 10,17 ****
  
  tristate 'Reiserfs support' CONFIG_REISERFS_FS
! dep_mbool '  Have reiserfs do extra internal checking' CONFIG_REISERFS_CHECK $CONFIG_REISERFS_FS
  dep_mbool '  Stats in /proc/fs/reiserfs' CONFIG_REISERFS_PROC_INFO $CONFIG_REISERFS_FS
  
! dep_tristate 'ADFS file system support' CONFIG_ADFS_FS $CONFIG_EXPERIMENTAL
  dep_mbool '  ADFS write support (DANGEROUS)' CONFIG_ADFS_FS_RW $CONFIG_ADFS_FS $CONFIG_EXPERIMENTAL
  
--- 10,17 ----
  
  tristate 'Reiserfs support' CONFIG_REISERFS_FS
! dep_mbool '  Enable reiserfs debug mode' CONFIG_REISERFS_CHECK $CONFIG_REISERFS_FS
  dep_mbool '  Stats in /proc/fs/reiserfs' CONFIG_REISERFS_PROC_INFO $CONFIG_REISERFS_FS
  
! dep_tristate 'ADFS file system support (EXPERIMENTAL)' CONFIG_ADFS_FS $CONFIG_EXPERIMENTAL
  dep_mbool '  ADFS write support (DANGEROUS)' CONFIG_ADFS_FS_RW $CONFIG_ADFS_FS $CONFIG_EXPERIMENTAL
  
***************
*** 20,23 ****
--- 20,26 ----
  dep_tristate 'Apple Macintosh file system support (EXPERIMENTAL)' CONFIG_HFS_FS $CONFIG_EXPERIMENTAL
  
+ dep_tristate 'BeOS file systemv(BeFS) support (read only) (EXPERIMENTAL)' CONFIG_BEFS_FS $CONFIG_EXPERIMENTAL
+ dep_mbool '  Debug Befs' CONFIG_BEFS_DEBUG $CONFIG_BEFS_FS
+ 
  dep_tristate 'Apple Extended HFS file system support (EXPERIMENTAL)' CONFIG_HFSPLUS_FS $CONFIG_EXPERIMENTAL
  
***************
*** 54,57 ****
--- 57,64 ----
  dep_mbool '  Transparent decompression extension' CONFIG_ZISOFS $CONFIG_ISO9660_FS
  
+ tristate 'JFS filesystem support' CONFIG_JFS_FS
+ dep_mbool '  JFS debugging' CONFIG_JFS_DEBUG $CONFIG_JFS_FS
+ dep_mbool '  JFS statistics' CONFIG_JFS_STATISTICS $CONFIG_JFS_FS
+ 
  tristate 'Minix fs support' CONFIG_MINIX_FS
  
***************
*** 95,99 ****
  
     dep_tristate 'Coda file system support (advanced network fs)' CONFIG_CODA_FS $CONFIG_INET
!    dep_tristate 'InterMezzo file system support (experimental, replicating fs)' CONFIG_INTERMEZZO_FS $CONFIG_INET $CONFIG_EXPERIMENTAL
     dep_tristate 'NFS file system support' CONFIG_NFS_FS $CONFIG_INET
     dep_mbool '  Provide NFSv3 client support' CONFIG_NFS_V3 $CONFIG_NFS_FS
--- 102,106 ----
  
     dep_tristate 'Coda file system support (advanced network fs)' CONFIG_CODA_FS $CONFIG_INET
!    dep_tristate 'InterMezzo file system support (replicating fs) (EXPERIMENTAL)' CONFIG_INTERMEZZO_FS $CONFIG_INET $CONFIG_EXPERIMENTAL
     dep_tristate 'NFS file system support' CONFIG_NFS_FS $CONFIG_INET
     dep_mbool '  Provide NFSv3 client support' CONFIG_NFS_V3 $CONFIG_NFS_FS
***************
*** 102,105 ****
--- 109,113 ----
     dep_tristate 'NFS server support' CONFIG_NFSD $CONFIG_INET
     dep_mbool '  Provide NFSv3 server support' CONFIG_NFSD_V3 $CONFIG_NFSD
+    dep_mbool '  Provide NFS server over TCP support (EXPERIMENTAL)' CONFIG_NFSD_TCP $CONFIG_NFSD $CONFIG_EXPERIMENTAL
  
     if [ "$CONFIG_NFS_FS" = "y" -o "$CONFIG_NFSD" = "y" ]; then
***************
*** 148,160 ****
  else
     define_tristate CONFIG_ZISOFS_FS n
- fi
- if [ "$CONFIG_CRAMFS" = "y" -o "$CONFIG_ZISOFS_FS" = "y" ]; then
-    define_tristate CONFIG_ZLIB_FS_INFLATE y
- else
-   if [ "$CONFIG_CRAMFS" = "m" -o "$CONFIG_ZISOFS_FS" = "m" ]; then
-      define_tristate CONFIG_ZLIB_FS_INFLATE m
-   else
-      define_tristate CONFIG_ZLIB_FS_INFLATE n
-   fi
  fi
  
--- 156,159 ----

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-hfsplus/linux/fs/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile	8 May 2002 03:01:47 -0000	1.3
--- Makefile	29 Apr 2003 06:38:46 -0000	1.4
***************
*** 15,19 ****
  		fcntl.o ioctl.o readdir.o select.o fifo.o locks.o \
  		dcache.o inode.o attr.o bad_inode.o file.o iobuf.o dnotify.o \
! 		filesystems.o namespace.o seq_file.o
  
  ifeq ($(CONFIG_QUOTA),y)
--- 15,19 ----
  		fcntl.o ioctl.o readdir.o select.o fifo.o locks.o \
  		dcache.o inode.o attr.o bad_inode.o file.o iobuf.o dnotify.o \
! 		filesystems.o namespace.o seq_file.o xattr.o
  
  ifeq ($(CONFIG_QUOTA),y)
***************
*** 30,34 ****
  subdir-$(CONFIG_JBD)		+= jbd
  subdir-$(CONFIG_EXT2_FS)	+= ext2
- subdir-$(CONFIG_ZLIB_FS_INFLATE) += inflate_fs
  subdir-$(CONFIG_CRAMFS)		+= cramfs
  subdir-$(CONFIG_RAMFS)		+= ramfs
--- 30,33 ----
***************
*** 69,72 ****
--- 68,73 ----
  subdir-$(CONFIG_DEVPTS_FS)	+= devpts
  subdir-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs
+ subdir-$(CONFIG_BEFS_FS)	+= befs
+ subdir-$(CONFIG_JFS_FS)		+= jfs
  
  



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf