[Gc-linux-cvs] linux/fs Kconfig,1.15,1.16 Makefile,1.14,1.15

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/gc-linux/linux/fs
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29988/fs

Modified Files:
	Kconfig Makefile 
Log Message:
Forward to v.2.6.30.

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/fs/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile	5 Mar 2009 19:58:47 -0000	1.14
--- Makefile	25 Oct 2009 18:45:36 -0000	1.15
***************
*** 12,16 ****
  		seq_file.o xattr.o libfs.o fs-writeback.o \
  		pnode.o drop_caches.o splice.o sync.o utimes.o \
! 		stack.o

  ifeq ($(CONFIG_BLOCK),y)
--- 12,16 ----
  		seq_file.o xattr.o libfs.o fs-writeback.o \
  		pnode.o drop_caches.o splice.o sync.o utimes.o \
! 		stack.o fs_struct.o

  ifeq ($(CONFIG_BLOCK),y)
***************
*** 52,60 ****
  obj-$(CONFIG_GENERIC_ACL)	+= generic_acl.o

! obj-$(CONFIG_QUOTA)		+= dquot.o
! obj-$(CONFIG_QFMT_V1)		+= quota_v1.o
! obj-$(CONFIG_QFMT_V2)		+= quota_v2.o
! obj-$(CONFIG_QUOTA_TREE)	+= quota_tree.o
! obj-$(CONFIG_QUOTACTL)		+= quota.o

  obj-$(CONFIG_PROC_FS)		+= proc/
--- 52,56 ----
  obj-$(CONFIG_GENERIC_ACL)	+= generic_acl.o

! obj-y				+= quota/

  obj-$(CONFIG_PROC_FS)		+= proc/
***************
*** 68,71 ****
--- 64,68 ----

  # Do not add any filesystems before this line
+ obj-$(CONFIG_FSCACHE)		+= fscache/
  obj-$(CONFIG_REISERFS_FS)	+= reiserfs/
  obj-$(CONFIG_EXT3_FS)		+= ext3/ # Before ext2 so root fs can be ext3
***************
*** 118,126 ****
--- 115,126 ----
  obj-$(CONFIG_9P_FS)		+= 9p/
  obj-$(CONFIG_AFS_FS)		+= afs/
+ obj-$(CONFIG_NILFS2_FS)		+= nilfs2/
  obj-$(CONFIG_BEFS_FS)		+= befs/
  obj-$(CONFIG_HOSTFS)		+= hostfs/
  obj-$(CONFIG_HPPFS)		+= hppfs/
+ obj-$(CONFIG_CACHEFILES)	+= cachefiles/
  obj-$(CONFIG_DEBUG_FS)		+= debugfs/
  obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
  obj-$(CONFIG_BTRFS_FS)		+= btrfs/
  obj-$(CONFIG_GFS2_FS)           += gfs2/
+ obj-$(CONFIG_EXOFS_FS)          += exofs/

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/fs/Kconfig,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Kconfig	2 Mar 2009 19:26:37 -0000	1.15
--- Kconfig	25 Oct 2009 18:45:36 -0000	1.16
***************
*** 57,115 ****
  source "fs/notify/Kconfig"

! config QUOTA
! 	bool "Quota support"
! 	help
! 	  If you say Y here, you will be able to set per user limits for disk
! 	  usage (also called disk quotas). Currently, it works for the
! 	  ext2, ext3, and reiserfs file system. ext3 also supports journalled
! 	  quotas for which you don't need to run quotacheck(8) after an unclean
! 	  shutdown.
! 	  For further details, read the Quota mini-HOWTO, available from
! 	  <http://www.tldp.org/docs.html#howto>, or the documentation provided
! 	  with the quota tools. Probably the quota support is only useful for
! 	  multi user systems. If unsure, say N.
! 
! config QUOTA_NETLINK_INTERFACE
! 	bool "Report quota messages through netlink interface"
! 	depends on QUOTA && NET
! 	help
! 	  If you say Y here, quota warnings (about exceeding softlimit, reaching
! 	  hardlimit, etc.) will be reported through netlink interface. If unsure,
! 	  say Y.
! 
! config PRINT_QUOTA_WARNING
! 	bool "Print quota warnings to console (OBSOLETE)"
! 	depends on QUOTA
! 	default y
! 	help
! 	  If you say Y here, quota warnings (about exceeding softlimit, reaching
! 	  hardlimit, etc.) will be printed to the process' controlling terminal.
! 	  Note that this behavior is currently deprecated and may go away in
! 	  future. Please use notification via netlink socket instead.
! 
! # Generic support for tree structured quota files. Seleted when needed.
! config QUOTA_TREE
! 	 tristate
! 
! config QFMT_V1
! 	tristate "Old quota format support"
! 	depends on QUOTA
! 	help
! 	  This quota format was (is) used by kernels earlier than 2.4.22. If
! 	  you have quota working and you don't want to convert to new quota
! 	  format say Y here.
! 
! config QFMT_V2
! 	tristate "Quota format v2 support"
! 	depends on QUOTA
! 	select QUOTA_TREE
! 	help
! 	  This quota format allows using quotas with 32-bit UIDs/GIDs. If you
! 	  need this functionality say Y here.
! 
! config QUOTACTL
! 	bool
! 	depends on XFS_QUOTA || QUOTA
! 	default y

  source "fs/autofs/Kconfig"
--- 57,61 ----
  source "fs/notify/Kconfig"

! source "fs/quota/Kconfig"

  source "fs/autofs/Kconfig"
***************
*** 121,124 ****
--- 67,77 ----
  	select FS_POSIX_ACL

+ menu "Caches"
+ 
+ source "fs/fscache/Kconfig"
+ source "fs/cachefiles/Kconfig"
+ 
+ endmenu
+ 
  if BLOCK
  menu "CD-ROM/DVD Filesystems"
***************
*** 223,226 ****
--- 176,206 ----
  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