From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Mon, 30 Aug 2021 07:50:06 +0000 (+0800)
Subject: crimson/os/seastore/lba_manager: drop the impossible case that the insert key exists... 
X-Git-Tag: v17.1.0~983^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1f09a184b4d936f7695faa8205263e0f5feed266;p=ceph.git

crimson/os/seastore/lba_manager: drop the impossible case that the insert key exists after handle_split

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
---

diff --git a/src/crimson/os/seastore/lba_manager/btree/lba_btree.cc b/src/crimson/os/seastore/lba_manager/btree/lba_btree.cc
index 6adb0fbbd5224..eb53d8d080330 100644
--- a/src/crimson/os/seastore/lba_manager/btree/lba_btree.cc
+++ b/src/crimson/os/seastore/lba_manager/btree/lba_btree.cc
@@ -181,19 +181,13 @@ LBABtree::insert_ret LBABtree::insert(
 	      ret.leaf.node = mut->cast<LBALeafNode>();
 	    }
 	    auto iter = ret.leaf.node->lower_bound(laddr);
-	    if (iter != ret.leaf.node->end() && iter->get_key() == laddr) {
-	      return insert_ret(
-		interruptible::ready_future_marker{},
-		std::make_pair(ret, false));
-	    } else {
-	      ret.leaf.pos = iter->get_offset();
-	      assert(laddr >= ret.leaf.node->get_meta().begin &&
-		     laddr < ret.leaf.node->get_meta().end);
-	      ret.leaf.node->insert(iter, laddr, val);
-	      return insert_ret(
-		interruptible::ready_future_marker{},
-		std::make_pair(ret, true));
-	    }
+	    assert(iter == ret.leaf.node->end() || iter->get_key() > laddr);
+	    assert(laddr >= ret.leaf.node->get_meta().begin &&
+		   laddr < ret.leaf.node->get_meta().end);
+	    ret.leaf.node->insert(iter, laddr, val);
+	    return insert_ret(
+	      interruptible::ready_future_marker{},
+	      std::make_pair(ret, true));
 	  });
 	}
       });