From: Igor Fedotov <ifedotov@mirantis.com>
Date: Thu, 8 Sep 2016 13:20:01 +0000 (+0000)
Subject: os/bluestore: remove some copy-pastes
X-Git-Tag: v11.0.1~297^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ccd9b5ea1e93e53c222baf83caa34661d8e19f0f;p=ceph.git

os/bluestore: remove some copy-pastes

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 65e684a49d69..6d649bb0acd1 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -1870,14 +1870,7 @@ BlueStore::extent_map_t::iterator BlueStore::ExtentMap::find(
 BlueStore::extent_map_t::iterator BlueStore::ExtentMap::find_lextent(
   uint64_t offset)
 {
-  Extent dummy(offset);
-  auto fp = extent_map.lower_bound(dummy);
-  if (fp != extent_map.begin()) {
-    --fp;
-    if (fp->logical_offset + fp->length <= offset) {
-      ++fp;
-    }
-  }
+  auto fp = seek_lextent(offset);
   if (fp != extent_map.end() && fp->logical_offset > offset)
     return extent_map.end();  // extent is past offset
   return fp;
@@ -1899,14 +1892,7 @@ BlueStore::extent_map_t::iterator BlueStore::ExtentMap::seek_lextent(
 
 bool BlueStore::ExtentMap::has_any_lextents(uint64_t offset, uint64_t length)
 {
-  Extent dummy(offset);
-  auto fp = extent_map.lower_bound(dummy);
-  if (fp != extent_map.begin()) {
-    --fp;
-    if (fp->logical_offset + fp->length <= offset) {
-      ++fp;
-    }
-  }
+  auto fp = seek_lextent(offset);
   if (fp == extent_map.end() || fp->logical_offset >= offset + length) {
     return false;
   }