Merge branch 'freespace-tree' into for-linus-4.5
authorChris Mason <clm@fb.com>
Fri, 18 Dec 2015 19:11:10 +0000 (11:11 -0800)
committerChris Mason <clm@fb.com>
Fri, 18 Dec 2015 19:11:10 +0000 (11:11 -0800)
commitf7d3d2f99eeaa9f5c111965b1516972f4fc5e449
tree2ad3d4d98af789fd807795a9683ce4904b3c4182
parent9f9499ae8e6415cefc4fe0a96ad0e27864353c89
parent70f6d82ec73c3ae2d3adc6853c5bebcd73610097
Merge branch 'freespace-tree' into for-linus-4.5

Signed-off-by: Chris Mason <clm@fb.com>
fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/super.c
fs/btrfs/tests/btrfs-tests.c
fs/btrfs/tests/free-space-tests.c
include/trace/events/btrfs.h