btrfs: eliminate if in main loop in tree_search_offset
authorNikolay Borisov <nborisov@suse.com>
Tue, 23 Nov 2021 07:23:42 +0000 (09:23 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 3 Jan 2022 14:09:46 +0000 (15:09 +0100)
Reshuffle the code inside the first loop of tree_search_offset so that
one if() is eliminated and the becomes more linear.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/free-space-cache.c

index bbe0b36a452abf9ea10eb7654e529c471eb4caf2..a45017b1218545a0946adfee0d647e736f4bf40c 100644 (file)
@@ -1636,15 +1636,10 @@ tree_search_offset(struct btrfs_free_space_ctl *ctl,
                   u64 offset, int bitmap_only, int fuzzy)
 {
        struct rb_node *n = ctl->free_space_offset.rb_node;
-       struct btrfs_free_space *entry, *prev = NULL;
+       struct btrfs_free_space *entry = NULL, *prev = NULL;
 
        /* find entry that is closest to the 'offset' */
-       while (1) {
-               if (!n) {
-                       entry = NULL;
-                       break;
-               }
-
+       while (n) {
                entry = rb_entry(n, struct btrfs_free_space, offset_index);
                prev = entry;
 
@@ -1654,6 +1649,8 @@ tree_search_offset(struct btrfs_free_space_ctl *ctl,
                        n = n->rb_right;
                else
                        break;
+
+               entry = NULL;
        }
 
        if (bitmap_only) {