From: Chris Mason <clm@fb.com>
Date: Wed, 23 Dec 2015 21:29:09 +0000 (-0800)
Subject: Merge branch 'freespace-4.5' into for-linus-4.5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f0f76413d332d74446d0ee9535a29a900c4f63e4;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

f0f76413d332d74446d0ee9535a29a900c4f63e4
diff --cc fs/btrfs/extent_io.h
index 254f49157eaf,350c8b0a8582..0377413bd4b9
--- a/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,