From: Nikolay Borisov Date: Mon, 22 Nov 2021 15:16:46 +0000 (+0200) Subject: btrfs: get next entry in tree_search_offset before doing checks X-Git-Tag: v5.17-rc1~133^2~84 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=167c0bd3775dc4ffedfd179c370994226d02a5c9;p=thirdparty%2Fkernel%2Fstable.git btrfs: get next entry in tree_search_offset before doing checks This is a small optimisation since the currently 'entry' is already checked in the if () {} else if {} construct above the loop. In essence the first iteration of the final while loop is redundant. To eliminate this extra check simply get the next entry at the beginning of the loop. Reviewed-by: Josef Bacik Signed-off-by: Nikolay Borisov Signed-off-by: David Sterba --- diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 3920beb02131a..bbe0b36a452ab 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -1730,6 +1730,10 @@ tree_search_offset(struct btrfs_free_space_ctl *ctl, return NULL; while (1) { + n = rb_next(&entry->offset_index); + if (!n) + return NULL; + entry = rb_entry(n, struct btrfs_free_space, offset_index); if (entry->bitmap) { if (entry->offset + BITS_PER_BITMAP * ctl->unit > offset) @@ -1738,11 +1742,6 @@ tree_search_offset(struct btrfs_free_space_ctl *ctl, if (entry->offset + entry->bytes > offset) break; } - - n = rb_next(&entry->offset_index); - if (!n) - return NULL; - entry = rb_entry(n, struct btrfs_free_space, offset_index); } return entry; }