OSDN Git Service

btrfs: inline code of reada_tree_block and remove it
authorDavid Sterba <dsterba@suse.cz>
Sat, 14 Jun 2014 22:51:19 +0000 (00:51 +0200)
committerDavid Sterba <dsterba@suse.cz>
Thu, 2 Oct 2014 14:31:27 +0000 (16:31 +0200)
It's trivial with a single user. And remove one pointless BUG_ON.

Signed-off-by: David Sterba <dsterba@suse.cz>
fs/btrfs/relocation.c

index 16cb2b4..d750632 100644 (file)
@@ -2857,15 +2857,6 @@ static int get_tree_block_key(struct reloc_control *rc,
        return 0;
 }
 
-static int reada_tree_block(struct reloc_control *rc,
-                           struct tree_block *block)
-{
-       BUG_ON(block->key_ready);
-       readahead_tree_block(rc->extent_root, block->bytenr,
-                       block->key.objectid);
-       return 0;
-}
-
 /*
  * helper function to relocate a tree block
  */
@@ -2945,7 +2936,8 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans,
        while (rb_node) {
                block = rb_entry(rb_node, struct tree_block, rb_node);
                if (!block->key_ready)
-                       reada_tree_block(rc, block);
+                       readahead_tree_block(rc->extent_root, block->bytenr,
+                                       block->key.objectid);
                rb_node = rb_next(rb_node);
        }