linux/fs/ext3
Linus Torvalds e8bebe2f71 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (69 commits)
  fix handling of offsets in cris eeprom.c, get rid of fake on-stack files
  get rid of home-grown mutex in cris eeprom.c
  switch ecryptfs_write() to struct inode *, kill on-stack fake files
  switch ecryptfs_get_locked_page() to struct inode *
  simplify access to ecryptfs inodes in ->readpage() and friends
  AFS: Don't put struct file on the stack
  Ban ecryptfs over ecryptfs
  logfs: replace inode uid,gid,mode initialization with helper function
  ufs: replace inode uid,gid,mode initialization with helper function
  udf: replace inode uid,gid,mode init with helper
  ubifs: replace inode uid,gid,mode initialization with helper function
  sysv: replace inode uid,gid,mode initialization with helper function
  reiserfs: replace inode uid,gid,mode initialization with helper function
  ramfs: replace inode uid,gid,mode initialization with helper function
  omfs: replace inode uid,gid,mode initialization with helper function
  bfs: replace inode uid,gid,mode initialization with helper function
  ocfs2: replace inode uid,gid,mode initialization with helper function
  nilfs2: replace inode uid,gid,mode initialization with helper function
  minix: replace inode uid,gid,mode init with helper
  ext4: replace inode uid,gid,mode init with helper
  ...

Trivial conflict in fs/fs-writeback.c (mark bitfields unsigned)
2010-05-21 19:37:45 -07:00
..
acl.c ext3: constify xattr handlers 2010-05-21 18:31:19 -04:00
acl.h
balloc.c
bitmap.c
dir.c
ext3_jbd.c
file.c
fsync.c Merge branch 'master' into for-2.6.35 2010-05-21 21:27:26 +02:00
hash.c
ialloc.c ext3: replace inode uid,gid,mode init with helper 2010-05-21 18:31:24 -04:00
inode.c quota: unify quota init condition in setattr 2010-05-21 19:30:45 +02:00
ioctl.c
Kconfig
Makefile
namei.c
namei.h
resize.c
super.c ext3: make barrier options consistent with ext4 2010-05-21 19:30:41 +02:00
symlink.c
xattr_security.c ext3: constify xattr handlers 2010-05-21 18:31:19 -04:00
xattr_trusted.c ext3: constify xattr handlers 2010-05-21 18:31:19 -04:00
xattr_user.c ext3: constify xattr handlers 2010-05-21 18:31:19 -04:00
xattr.c ext3: constify xattr handlers 2010-05-21 18:31:19 -04:00
xattr.h ext3: constify xattr handlers 2010-05-21 18:31:19 -04:00