1
0
Fork 0
alistair23-linux/fs/ufs
Linus Torvalds e213e26ab3 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: (33 commits)
  quota: stop using QUOTA_OK / NO_QUOTA
  dquot: cleanup dquot initialize routine
  dquot: move dquot initialization responsibility into the filesystem
  dquot: cleanup dquot drop routine
  dquot: move dquot drop responsibility into the filesystem
  dquot: cleanup dquot transfer routine
  dquot: move dquot transfer responsibility into the filesystem
  dquot: cleanup inode allocation / freeing routines
  dquot: cleanup space allocation / freeing routines
  ext3: add writepage sanity checks
  ext3: Truncate allocated blocks if direct IO write fails to update i_size
  quota: Properly invalidate caches even for filesystems with blocksize < pagesize
  quota: generalize quota transfer interface
  quota: sb_quota state flags cleanup
  jbd: Delay discarding buffers in journal_unmap_buffer
  ext3: quota_write cross block boundary behaviour
  quota: drop permission checks from xfs_fs_set_xstate/xfs_fs_set_xquota
  quota: split out compat_sys_quotactl support from quota.c
  quota: split out netlink notification support from quota.c
  quota: remove invalid optimization from quota_sync_all
  ...

Fixed trivial conflicts in fs/namei.c and fs/ufs/inode.c
2010-03-05 13:20:53 -08:00
..
Kconfig fs/Kconfig: move ufs out 2009-01-22 13:16:00 +03:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
balloc.c dquot: cleanup space allocation / freeing routines 2010-03-05 00:20:28 +01:00
cylinder.c drop linux/ufs_fs.h from userspace export and relocate it to fs/ufs/ufs_fs.h 2008-02-08 09:22:39 -08:00
dir.c sanitize const/signedness of ufs a bit 2010-03-03 14:07:57 -05:00
file.c dquot: cleanup dquot initialize routine 2010-03-05 00:20:30 +01:00
ialloc.c dquot: cleanup dquot initialize routine 2010-03-05 00:20:30 +01:00
inode.c Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 2010-03-05 13:20:53 -08:00
namei.c dquot: cleanup dquot initialize routine 2010-03-05 00:20:30 +01:00
super.c dquot: cleanup dquot drop routine 2010-03-05 00:20:30 +01:00
swab.h ufs: replace __inline with inline 2008-04-28 08:58:45 -07:00
symlink.c drop linux/ufs_fs.h from userspace export and relocate it to fs/ufs/ufs_fs.h 2008-02-08 09:22:39 -08:00
truncate.c dquot: cleanup dquot initialize routine 2010-03-05 00:20:30 +01:00
ufs.h pass writeback_control to ->write_inode 2010-03-05 13:25:52 -05:00
ufs_fs.h drop linux/ufs_fs.h from userspace export and relocate it to fs/ufs/ufs_fs.h 2008-02-08 09:22:39 -08:00
util.c drop linux/ufs_fs.h from userspace export and relocate it to fs/ufs/ufs_fs.h 2008-02-08 09:22:39 -08:00
util.h ufs: fix parenthesisation in ufs_set_fs_state() 2008-02-23 17:12:13 -08:00