Btrfs: remove unnecessary ref heads rb tree search
authorFilipe Manana <fdmanana@gmail.com>
Wed, 12 Feb 2014 15:07:52 +0000 (15:07 +0000)
committerJosef Bacik <jbacik@fb.com>
Mon, 10 Mar 2014 19:16:46 +0000 (15:16 -0400)
When we didn't find the exact ref head we were looking for, if
return_bigger != 0 we set a new search key to match either the
next node after the last one we found or the first one in the
ref heads rb tree, and then did another full tree search. For both
cases this ended up being pointless as we would end up returning
an entry we already had before repeating the search.

Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>
fs/btrfs/delayed-ref.c

index f3bff89eecf09346e2eb49b4ffeb861f35e33d4b..56cdfe988d69e82b0b5942a5169713c918c98a50 100644 (file)
@@ -205,7 +205,6 @@ find_ref_head(struct rb_root *root, u64 bytenr,
        struct btrfs_delayed_ref_head *entry;
        int cmp = 0;
 
-again:
        n = root->rb_node;
        entry = NULL;
        while (n) {
@@ -234,9 +233,9 @@ again:
                                n = rb_first(root);
                        entry = rb_entry(n, struct btrfs_delayed_ref_head,
                                         href_node);
-                       bytenr = entry->node.bytenr;
-                       return_bigger = 0;
-                       goto again;
+                       if (last)
+                               *last = entry;
+                       return entry;
                }
                return entry;
        }