tree 8df3309198b2ab87f549c82c59125d2b106bcdbe
parent e6a0a8bfef1094084e53bfaad6d512c23da7a6dd
parent 9c2693c9243b81802c6860570557165e874779a7
author Linus Torvalds <torvalds@linux-foundation.org> 1254453795 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1254453795 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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