kernel_optimize_test/fs/ext2
Linus Torvalds d28619f156 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  quota: Convert quota statistics to generic percpu_counter
  ext3 uses rb_node = NULL; to zero rb_root.
  quota: Fixup dquot_transfer
  reiserfs: Fix resuming of quotas on remount read-write
  pohmelfs: Remove dead quota code
  ufs: Remove dead quota code
  udf: Remove dead quota code
  quota: rename default quotactl methods to dquot_
  quota: explicitly set ->dq_op and ->s_qcop
  quota: drop remount argument to ->quota_on and ->quota_off
  quota: move unmount handling into the filesystem
  quota: kill the vfs_dq_off and vfs_dq_quota_on_remount wrappers
  quota: move remount handling into the filesystem
  ocfs2: Fix use after free on remount read-only

Fix up conflicts in fs/ext4/super.c and fs/ufs/file.c
2010-05-30 09:11:11 -07:00
..
acl.c ext2: constify xattr_handler 2010-05-21 18:31:18 -04:00
acl.h ext[234]: move over to 'check_acl' permission model 2009-09-08 11:09:04 -07:00
balloc.c ext2: Avoid loading bitmaps for full groups during block allocation 2010-05-21 19:30:37 +02:00
dir.c ext2: report metadata errors during fsync 2009-12-16 07:20:06 -08:00
ext2.h ext2: convert to use the new truncate convention. 2010-05-27 22:15:57 -04:00
file.c ext2: convert to use the new truncate convention. 2010-05-27 22:15:57 -04:00
ialloc.c ext2: replace inode uid,gid,mode init with helper 2010-05-21 18:31:24 -04:00
inode.c ext2: convert to use the new truncate convention. 2010-05-27 22:15:57 -04:00
ioctl.c headers: smp_lock.h redux 2009-07-12 12:22:34 -07:00
Kconfig fs/Kconfig: move ext2, ext3, ext4, JBD, JBD2 out 2008-10-20 11:43:59 -07:00
Makefile switch ext2 to simple_fsync() 2009-06-11 21:36:12 -04:00
namei.c dquot: cleanup dquot initialize routine 2010-03-05 00:20:30 +01:00
super.c quota: rename default quotactl methods to dquot_ 2010-05-24 14:10:17 +02:00
symlink.c ext2: symlink must be handled via filesystem specific operation 2010-04-12 21:11:25 +02:00
xattr_security.c ext2: constify xattr_handler 2010-05-21 18:31:18 -04:00
xattr_trusted.c ext2: constify xattr_handler 2010-05-21 18:31:18 -04:00
xattr_user.c ext2: constify xattr_handler 2010-05-21 18:31:18 -04:00
xattr.c ext2: constify xattr_handler 2010-05-21 18:31:18 -04:00
xattr.h ext2: constify xattr_handler 2010-05-21 18:31:18 -04:00
xip.c ext2: Unify log messages in ext2 2009-12-10 15:02:52 +01:00
xip.h xip: support non-struct page backed memory 2008-04-28 08:58:23 -07:00