tree 3aae053ccbf3b6206fe6d17e62172559d35a7711
parent 14b6084daa61bfd4da926f63e6e8bd0b6de87ad9
parent 46a53cca826e71effe59e3cb4f383622c33ebdcb
author Linus Torvalds <torvalds@linux-foundation.org> 1240856193 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1240856193 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: look for acls during btrfs_read_locked_inode
  Btrfs: fix acl caching
  Btrfs: Fix a bunch of printk() warnings.
  Btrfs: Fix a trivial warning using max() of u64 vs ULL.
  Btrfs: remove unused btrfs_bit_radix slab
  Btrfs: ratelimit IO error printks
  Btrfs: remove #if 0 code
  Btrfs: When shrinking, only update disk size on success
  Btrfs: fix deadlocks and stalls on dead root removal
  Btrfs: fix fallocate deadlock on inode extent lock
  Btrfs: kill btrfs_cache_create
  Btrfs: don't export symbols
  Btrfs: simplify makefile
  Btrfs: try to keep a healthy ratio of metadata vs data block groups