Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Oct 2009 03:23:15 +0000 (20:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Oct 2009 03:23:15 +0000 (20:23 -0700)
commit0efe5e32c8729ef44b00d9a7203e4c99a6378b27
tree8df3309198b2ab87f549c82c59125d2b106bcdbe
parente6a0a8bfef1094084e53bfaad6d512c23da7a6dd
parent9c2693c9243b81802c6860570557165e874779a7
Merge branch 'for-linus' of git://git./linux/kernel/git/mason/btrfs-unstable

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: fix data space leak fix
  Btrfs: remove duplicates of filemap_ helpers
  Btrfs: take i_mutex before generic_write_checks
  Btrfs: fix arguments to btrfs_wait_on_page_writeback_range
  Btrfs: fix deadlock with free space handling and user transactions
  Btrfs: fix error cases for ioctl transactions
  Btrfs: Use CONFIG_BTRFS_POSIX_ACL to enable ACL code
  Btrfs: introduce missing kfree
  Btrfs: Fix setting umask when POSIX ACLs are not enabled
  Btrfs: proper -ENOSPC handling
fs/btrfs/ctree.h
fs/btrfs/file.c
fs/btrfs/inode.c