Merge branch 'freespace-4.5' into for-linus-4.5

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/extent_io.c
Simple merge

diff --cc fs/btrfs/extent_io.h
index 254f49157eaf7ac4a5196616f8a872e03ae8096f,350c8b0a85826ece7fed1951682972e603195880..0377413bd4b98257eae07d12041d4dce45ac2c4f
--- 1/fs/btrfs/extent_io.h
--- 2/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@@ -396,10 -330,16 +398,16 @@@ void memmove_extent_buffer(struct exten
                           unsigned long src_offset, unsigned long len);
  void memset_extent_buffer(struct extent_buffer *eb, char c,
                          unsigned long start, unsigned long len);
+ int extent_buffer_test_bit(struct extent_buffer *eb, unsigned long start,
+                          unsigned long pos);
+ void extent_buffer_bitmap_set(struct extent_buffer *eb, unsigned long start,
+                             unsigned long pos, unsigned long len);
+ void extent_buffer_bitmap_clear(struct extent_buffer *eb, unsigned long start,
+                               unsigned long pos, unsigned long len);
  void clear_extent_buffer_dirty(struct extent_buffer *eb);
  int set_extent_buffer_dirty(struct extent_buffer *eb);
 -int set_extent_buffer_uptodate(struct extent_buffer *eb);
 -int clear_extent_buffer_uptodate(struct extent_buffer *eb);
 +void set_extent_buffer_uptodate(struct extent_buffer *eb);
 +void clear_extent_buffer_uptodate(struct extent_buffer *eb);
  int extent_buffer_uptodate(struct extent_buffer *eb);
  int extent_buffer_under_io(struct extent_buffer *eb);
  int map_private_extent_buffer(struct extent_buffer *eb, unsigned long offset,