From b568492fbd9228980d079e8ac60294ca25721891 Mon Sep 17 00:00:00 2001 From: hyche Date: Fri, 15 Dec 2017 06:31:21 +0700 Subject: [PATCH] btrfs: Make SearchSlot() look cleaner --- src/add-ons/kernel/file_systems/btrfs/BTree.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/add-ons/kernel/file_systems/btrfs/BTree.cpp b/src/add-ons/kernel/file_systems/btrfs/BTree.cpp index e632f7bde9..70e955df92 100644 --- a/src/add-ons/kernel/file_systems/btrfs/BTree.cpp +++ b/src/add-ons/kernel/file_systems/btrfs/BTree.cpp @@ -125,19 +125,15 @@ BTree::Node::SearchSlot(const btrfs_key& key, int* slot, btree_traversing type) // m-1 m m+1 // k : comp < 0 // k : comp > 0 - if (type == BTREE_BACKWARD) { - *slot = mid - 1; - if (comp > 0) - *slot = mid; - } else if (type == BTREE_FORWARD) { - *slot = mid; - if (comp > 0) - *slot = mid + 1; - } + if (type == BTREE_BACKWARD && comp < 0) + mid--; + else if (type == BTREE_FORWARD && comp > 0) + mid++; - if (type == BTREE_EXACT || *slot < 0) + if (type == BTREE_EXACT || mid < 0) return B_ENTRY_NOT_FOUND; + *slot = mid; TRACE("SearchSlot() found slot %" B_PRId32 " comp %" B_PRId32 "\n", *slot, comp); return B_OK;