| commit | 0e5b88cd9975dca6c191cc9bd11f233fac4ca882 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 13 Mar 2011 23:00:49 +0000 (13 16:00 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 13 Mar 2011 23:00:49 +0000 (13 16:00 -0700) | ||
| tree | 6302317acfb24d6b5ad7924aceaa0dd1c4a7a371 | treesnapshot (tar.gz zip) |
| parent | eebea5d13d391981061d6ef069a841002eba4a7a | commitdiff |
| parent | 36e39c40b3facc9b489a13f1d301fc53ff6960a3 | commitdiff |
Merge git://git./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
* 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