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
balloc.c
dir.c
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
Kconfig
Makefile
namei.c
super.c quota: rename default quotactl methods to dquot_ 2010-05-24 14:10:17 +02:00
symlink.c
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
xip.h