From: Chris Mason <clm@fb.com>
Date: Wed, 23 Dec 2015 21:17:42 +0000 (-0800)
Subject: Merge branch 'dev/simplify-set-bit' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bb9d687618695e8291f1e6209eb3211d231f97bb;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'dev/simplify-set-bit' of git://git./linux/kernel/git/kdave/linux into for-linus-4.5

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

bb9d687618695e8291f1e6209eb3211d231f97bb
diff --cc fs/btrfs/extent_io.c
index efe6ac627be9,044ffa3a520a..4d62b8230a64
--- a/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;