From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Oct 2009 03:23:15 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs... 
X-Git-Tag: v2.6.32-rc3~13
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0efe5e32c8729ef44b00d9a7203e4c99a6378b27;p=~shefty%2Frdma-dev.git

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
---

0efe5e32c8729ef44b00d9a7203e4c99a6378b27