Merge branch 'dev/simplify-set-bit' of git://git.kernel.org/pub/scm/linux/kernel...

Signed-off-by: Chris Mason <clm@fb.com>

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

diff --cc fs/btrfs/extent_io.c
index efe6ac6,044ffa3..4d62b82
--- 1/fs/btrfs/extent_io.c
--- 2/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@@ -1438,20 -1363,7 +1363,7 @@@ int try_lock_extent(struct extent_io_tr
        return 1;
  }
  
- int unlock_extent_cached(struct extent_io_tree *tree, u64 start, u64 end,
-                        struct extent_state **cached, gfp_t mask)
- {
-       return clear_extent_bit(tree, start, end, EXTENT_LOCKED, 1, 0, cached,
-                               mask);
- }
- 
- int unlock_extent(struct extent_io_tree *tree, u64 start, u64 end)
- {
-       return clear_extent_bit(tree, start, end, EXTENT_LOCKED, 1, 0, NULL,
-                               GFP_NOFS);
- }
- 
 -int extent_range_clear_dirty_for_io(struct inode *inode, u64 start, u64 end)
 +void extent_range_clear_dirty_for_io(struct inode *inode, u64 start, u64 end)
  {
        unsigned long index = start >> PAGE_CACHE_SHIFT;
        unsigned long end_index = end >> PAGE_CACHE_SHIFT;

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

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

diff --cc fs/btrfs/free-space-cache.c
Simple merge

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

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

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