btrfs: return void in functions without error conditions

Signed-off-by: Jeff Mahoney <jeffm@suse.com>

1 files changed, 14 insertions, 21 deletions

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 8368baa1f372..65216fabacbb 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -142,6 +142,7 @@ static struct extent_state *alloc_extent_state(gfp_t mask)
 #endif
         atomic_set(&state->refs, 1);
         init_waitqueue_head(&state->wq);
+        trace_alloc_extent_state(state, mask, _RET_IP_);
         return state;
 }
 
@@ -159,6 +160,7 @@ void free_extent_state(struct extent_state *state)
                 list_del(&state->leak_list);
                 spin_unlock_irqrestore(&leak_lock, flags);
 #endif
+                trace_free_extent_state(state, _RET_IP_);
                 kmem_cache_free(extent_state_cache, state);
         }
 }
@@ -617,8 +619,8 @@ search_again:
         goto again;
 }
 
-static int wait_on_state(struct extent_io_tree *tree,
-                         struct extent_state *state)
+static void wait_on_state(struct extent_io_tree *tree,
+                          struct extent_state *state)
                 __releases(tree->lock)
                 __acquires(tree->lock)
 {
@@ -628,7 +630,6 @@ static int wait_on_state(struct extent_io_tree *tree,
         schedule();
         spin_lock(&tree->lock);
         finish_wait(&state->wq, &wait);
-        return 0;
 }
 
 /*
@@ -636,7 +637,7 @@ static int wait_on_state(struct extent_io_tree *tree,
  * The range [start, end] is inclusive.
  * The tree lock is taken by this function
  */
-int wait_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, int bits)
+void wait_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, int bits)
 {
         struct extent_state *state;
         struct rb_node *node;
@@ -673,7 +674,6 @@ again:
         }
 out:
         spin_unlock(&tree->lock);
-        return 0;
 }
 
 static void set_state_bits(struct extent_io_tree *tree,
@@ -1359,9 +1359,9 @@ out:
         return found;
 }
 
-static noinline int __unlock_for_delalloc(struct inode *inode,
-                                          struct page *locked_page,
-                                          u64 start, u64 end)
+static noinline void __unlock_for_delalloc(struct inode *inode,
+                                           struct page *locked_page,
+                                           u64 start, u64 end)
 {
         int ret;
         struct page *pages[16];
@@ -1371,7 +1371,7 @@ static noinline int __unlock_for_delalloc(struct inode *inode,
         int i;
 
         if (index == locked_page->index && end_index == index)
-                return 0;
+                return;
 
         while (nr_pages > 0) {
                 ret = find_get_pages_contig(inode->i_mapping, index,
@@ -1386,7 +1386,6 @@ static noinline int __unlock_for_delalloc(struct inode *inode,
                 index += ret;
                 cond_resched();
         }
-        return 0;
 }
 
 static noinline int lock_delalloc_pages(struct inode *inode,
@@ -1777,39 +1776,34 @@ int test_range_bit(struct extent_io_tree *tree, u64 start, u64 end,
  * helper function to set a given page up to date if all the
  * extents in the tree for that page are up to date
  */
-static int check_page_uptodate(struct extent_io_tree *tree,
-                               struct page *page)
+static void check_page_uptodate(struct extent_io_tree *tree, struct page *page)
 {
         u64 start = (u64)page->index << PAGE_CACHE_SHIFT;
         u64 end = start + PAGE_CACHE_SIZE - 1;
         if (test_range_bit(tree, start, end, EXTENT_UPTODATE, 1, NULL))
                 SetPageUptodate(page);
-        return 0;
 }
 
 /*
  * helper function to unlock a page if all the extents in the tree
  * for that page are unlocked
  */
-static int check_page_locked(struct extent_io_tree *tree,
-                             struct page *page)
+static void check_page_locked(struct extent_io_tree *tree, struct page *page)
 {
         u64 start = (u64)page->index << PAGE_CACHE_SHIFT;
         u64 end = start + PAGE_CACHE_SIZE - 1;
         if (!test_range_bit(tree, start, end, EXTENT_LOCKED, 0, NULL))
                 unlock_page(page);
-        return 0;
 }
 
 /*
  * helper function to end page writeback if all the extents
  * in the tree for that page are done with writeback
  */
-static int check_page_writeback(struct extent_io_tree *tree,
-                             struct page *page)
+static void check_page_writeback(struct extent_io_tree *tree,
+                                 struct page *page)
 {
         end_page_writeback(page);
-        return 0;
 }
 
 /*
@@ -3835,7 +3829,7 @@ void free_extent_buffer(struct extent_buffer *eb)
         WARN_ON(1);
 }
 
-int clear_extent_buffer_dirty(struct extent_io_tree *tree,
+void clear_extent_buffer_dirty(struct extent_io_tree *tree,
                               struct extent_buffer *eb)
 {
         unsigned long i;
@@ -3867,7 +3861,6 @@ int clear_extent_buffer_dirty(struct extent_io_tree *tree,
                 ClearPageError(page);
                 unlock_page(page);
         }
-        return 0;
 }
 
 int set_extent_buffer_dirty(struct extent_io_tree *tree,