From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 13 Mar 2011 23:00:49 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~4055
X-Git-Url: https://git.proxmox.com/?p=mirror_ubuntu-zesty-kernel.git;a=commitdiff_plain;h=0e5b88cd9975dca6c191cc9bd11f233fac4ca882

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: break out of shrink_delalloc earlier
  btrfs: fix not enough reserved space
  btrfs: fix dip leak
  Btrfs: make sure not to return overlapping extents to fiemap
  Btrfs: deal with short returns from copy_from_user
  Btrfs: fix regressions in copy_from_user handling
---

0e5b88cd9975dca6c191cc9bd11f233fac4ca882