Btrfs: more block allocator work

Signed-off-by: Chris Mason <chris.mason@oracle.com>

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/extent-tree.c
Simple merge

diff --cc fs/btrfs/super.c
Simple merge