alistair23-linux/fs/ext4
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 ext4: constify xattr_handler 2010-05-21 18:31:19 -04:00
acl.h
balloc.c ext4: don't use quota reservation for speculative metadata 2010-05-16 11:00:00 -04:00
bitmap.c
block_validity.c ext4: Drop whitespace at end of lines 2010-05-17 07:00:00 -04:00
dir.c ext4: Use bitops to read/modify i_flags in struct ext4_inode_info 2010-05-16 22:00:00 -04:00
ext4.h drop unused dentry argument to ->fsync 2010-05-27 22:05:02 -04:00
ext4_extents.h
ext4_jbd2.c ext4: Fix BUG_ON at fs/buffer.c:652 in no journal mode 2010-02-16 15:06:29 -05:00
ext4_jbd2.h ext4: Use bitops to read/modify i_flags in struct ext4_inode_info 2010-05-16 22:00:00 -04:00
extents.c ext4: Drop whitespace at end of lines 2010-05-17 07:00:00 -04:00
file.c ext4: Use bitops to read/modify i_flags in struct ext4_inode_info 2010-05-16 22:00:00 -04:00
fsync.c rename the generic fsync implementations 2010-05-27 22:06:06 -04:00
hash.c
ialloc.c Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 2010-05-27 10:26:37 -07:00
inode.c Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 2010-05-27 10:26:37 -07:00
ioctl.c ext4: Drop whitespace at end of lines 2010-05-17 07:00:00 -04:00
Kconfig
Makefile
mballoc.c ext4: Drop whitespace at end of lines 2010-05-17 07:00:00 -04:00
mballoc.h ext4: consolidate in_range() definitions 2010-03-03 23:55:01 -05:00
migrate.c ext4: Use bitops to read/modify i_flags in struct ext4_inode_info 2010-05-16 22:00:00 -04:00
move_extent.c ext4: Use bitops to read/modify i_flags in struct ext4_inode_info 2010-05-16 22:00:00 -04:00
namei.c ext4: Make fsync sync new parent directories in no-journal mode 2010-05-17 08:00:00 -04:00
resize.c ext4: check s_log_groups_per_flex in online resize code 2010-05-16 01:00:00 -04:00
super.c Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 2010-05-30 09:11:11 -07:00
symlink.c ext4: symlink must be handled via filesystem specific operation 2010-05-16 02:00:00 -04:00
xattr.c Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 2010-05-27 10:26:37 -07:00
xattr.h ext4: constify xattr_handler 2010-05-21 18:31:19 -04:00
xattr_security.c ext4: constify xattr_handler 2010-05-21 18:31:19 -04:00
xattr_trusted.c ext4: constify xattr_handler 2010-05-21 18:31:19 -04:00
xattr_user.c ext4: constify xattr_handler 2010-05-21 18:31:19 -04:00