Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jan 2010 17:48:29 +0000 (09:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jan 2010 17:48:29 +0000 (09:48 -0800)
commit79ecb043ea0ae046463f03dea46c5e13a9312205
tree7355a535d159caa8e017a490dc78063f125f4208
parentdb1fc95744827a04f7e127681493bf1c1d3ab688
parentba198098a21a5dc8885fddfb308135bc2f138003
Merge git://git./linux/kernel/git/steve/gfs2-2.6-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: Use MAX_LFS_FILESIZE for meta inode size
  GFS2: Fix gfs2_xattr_acl_chmod()
  GFS2: Fix locking bug in rename
  GFS2: Ensure uptodate inode size when using O_APPEND